Commits · f9485bd25bd109a7998ae593a36fb21cbb65ca9c · Software_Artifact_Infrastructure_Repository / dolibarr

Oct 09, 2015
- Merge remote-tracking branch 'origin/3.6' into 3.7 · f9485bd2
  Laurent Destailleur authored 9 years ago
  
  Conflicts: htdocs/core/class/extrafields.class.php
  f9485bd2
- Merge pull request #3665 from altatof/fix_extrafields · b27989d5
  Laurent Destailleur authored 9 years ago
  
  reenable search criteria in sql clause
  b27989d5
- Merge pull request #3678 from GPCsolutions/3.7-calcul_price_total-warning · c675f88d
  Laurent Destailleur authored 9 years ago
  
  [Qual] Prevent warning
  c675f88d
- Merge pull request #3664 from FHenry/3.7 · 53c9cb38
  Laurent Destailleur authored 9 years ago
  
  FIX : New adherent from, always redirect on entity
  53c9cb38
Oct 07, 2015
- Merge pull request #3675 from GPCsolutions/3.7-3666 · 8f5d9597
  Laurent Destailleur authored 9 years ago
  
  Fixes for checkbox extrafields
  8f5d9597
Oct 06, 2015
- [Qual] Prevent warning · c208fccf
  Raphaël Doursenaud authored 9 years ago
  
  calcul_price_total() prefers to have the seller and localtaxes specified
  c208fccf
Oct 05, 2015
- Fix #3667 checkbox extrafields on edit · afbee449
  Raphaël Doursenaud authored 9 years ago
  
  For actions and members.
  afbee449
- Fix #3666 checkbox extrafields on edit · 3fdd59bf
  Raphaël Doursenaud authored 9 years ago
  
  3fdd59bf
- Added type hinting to extrafields object · 41354ca0
  Raphaël Doursenaud authored 9 years ago
  
  41354ca0
- Fix: wrong parameters order · d24f5538
  Raphaël Doursenaud authored 9 years ago
  
  d24f5538
- reenable search criteria in sql clause · bf262c2c
  Christophe Battarel authored 9 years ago
  
  bf262c2c
- Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 · 9dd4a233
  Florian Henry authored 9 years ago
  
  9dd4a233
- FIX : New adherent from, always redirect on entity · c9d8e041
  Florian Henry authored 9 years ago
  
  c9d8e041
Oct 04, 2015
- Merge pull request #3635 from FHenry/3.7 · 406b2712
  Laurent Destailleur authored 9 years ago
  
  FIX : Mass Mailing activity don't display all status
  406b2712
Oct 01, 2015
- FIX : Mass Mailing activity don't display all status · fd29bb34
  Florian Henry authored 9 years ago
  
  fd29bb34
- FIX #3630 - Wrong balance report when module salaries and donation · 4201e8b0
  Laurent Destailleur authored 9 years ago
  
  disabled
  4201e8b0
- Merge remote-tracking branch 'origin/3.6' into 3.7 · 076f2ed9
  Laurent Destailleur authored 9 years ago
  
  Conflicts: htdocs/core/lib/security.lib.php
  076f2ed9
- Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 · 72c31c0f
  Laurent Destailleur authored 9 years ago
  
  72c31c0f
- Add comment · 4da8fb90
  Laurent Destailleur authored 9 years ago
  
  4da8fb90
- Merge pull request #3619 from atm-arnaud/3.6_fix_facturestat · 1907e5da
  Laurent Destailleur authored 9 years ago
  
  FIX facturestat bad sql when customer view is limited
  1907e5da
- Merge pull request #3618 from atm-alexis/fix_event_for_user_restricted_if_no_company · 34adc60d
  Laurent Destailleur authored 9 years ago
  
  FIX error in SQL due to a previous fix
  34adc60d
- Merge pull request #3615 from FHenry/3.7 · 9c28894e
  Laurent Destailleur authored 9 years ago
  
  FIX : When delete actioncomm also delete actioncomm_resources
  9c28894e
- Merge pull request #3612 from grandoc/3.7 · 74fb718b
  Laurent Destailleur authored 9 years ago
  
  missing translation
  74fb718b
Sep 30, 2015
- FIX : Email selector contact must not include inactive contact · a96b92a6
  Florian Henry authored 9 years ago
  
  a96b92a6
Sep 29, 2015
- FIX : Admin fiche inter page do not take good action · e209fb23
  Florian Henry authored 9 years ago
  
  e209fb23
- FIX: display error on extrafields on ficheinter · fecd213b
  Florian Henry authored 9 years ago
  
  fecd213b
- FIX : update2.php test res befre assign it · bb0de1dc
  Florian Henry authored 9 years ago
  
  bb0de1dc
- spacing · 766b8535
  Florian Henry authored 9 years ago
  
  766b8535
- review · 4f5e207f
  Florian Henry authored 9 years ago
  
  4f5e207f
Sep 28, 2015
- FIX facturestat bad sql when customer view is limited · 0b7305d2
  arnaud authored 9 years ago
  
  0b7305d2
- FIX error in SQL due to a previous fix · 453ed8a0
  Alexis ALGOUD authored 9 years ago
  
  453ed8a0
- FIX : When delete actioncomm also delete actioncomm_resources · 0f27edad
  Florian Henry authored 9 years ago
  
  0f27edad
Sep 27, 2015
- fix : Missing argument 1 for CommonDocGenerator::__construct() · 6f128907
  Philippe Grand authored 9 years ago
  
  6f128907
- missing translation · 1454d942
  Philippe Grand authored 9 years ago
  
  1454d942
Sep 22, 2015
- Update ignore to secure packaging · 90b78702
  Laurent Destailleur authored 9 years ago
  
  90b78702
- Update ignore to secure · c125ba0d
  Laurent Destailleur authored 9 years ago
  
  Conflicts: htdocs/.gitignore
  c125ba0d
Sep 18, 2015
- Merge pull request #3550 from AlainRnet/patch-2 · f9973d13
  Laurent Destailleur authored 9 years ago
  
  Update categorie.php
  f9973d13
Sep 17, 2015

AlainRnet authored 9 years ago

voir https://github.com/Dolibarr/dolibarr/pull/3540/files (je n'avais pas vu dans quelle branche j'étais)

8dd843ab

Sep 16, 2015
- Merge pull request #3532 from FHenry/3.7 · 82518074
  Laurent Destailleur authored 9 years ago
  
  FIX : #3530
  82518074
- Merge pull request #3535 from GPCsolutions/3.7-debian · 30ccd28d
  Laurent Destailleur authored 9 years ago
  
  FIX Syntax error in Debian Apache configuration
  30ccd28d