Commits · e2e6049c7f5f45943140684c972ae16eacb144b6 · Software_Artifact_Infrastructure_Repository / dolibarr

Apr 18, 2015
- Copyright · e2e6049c
  Marcos García de La Fuente authored 9 years ago
  
  e2e6049c
- Merge branch 'develop' into fr-2613 · c07e26dc
  Marcos García de La Fuente authored 9 years ago
  
  Conflicts: htdocs/install/mysql/migration/3.7.0-3.8.0.sql
  c07e26dc
- NEW: Feature request: A page to merge two thirdparties into one #2613 · dc790ff5
  Marcos García de La Fuente authored 9 years ago
  
  dc790ff5
- Merge pull request #2633 from bafbes/develop · 21a6fd1c
  Laurent Destailleur authored 9 years ago
  
  NEW : dev feature : replace conf filename with "conf" parameter on url b...
  21a6fd1c
- git push origin developMerge branch 'fappels-develop' into develop · f80674f1
  Laurent Destailleur authored 9 years ago
  
  f80674f1
- Merge branch 'develop' of https://github.com/fappels/dolibarr into fappels-develop · 8be83cd0
  Laurent Destailleur authored 9 years ago
  
  Conflicts: htdocs/langs/en_US/sendings.lang
  8be83cd0
- Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop · b3fc8d29
  Laurent Destailleur authored 9 years ago
  
  Conflicts: htdocs/langs/en_US/products.lang
  b3fc8d29
- git push origin developMerge branch 'Diciannove-langtool' into develop · 8140e331
  Laurent Destailleur authored 9 years ago
  
  8140e331
- Merge branch 'langtool' of https://github.com/Diciannove/dolibarr into Diciannove-langtool · fcbb4a53
  Laurent Destailleur authored 9 years ago
  
  Conflicts: htdocs/langs/en_US/main.lang htdocs/langs/en_US/orders.lang htdocs/langs/en_US/stocks.lang
  fcbb4a53
- Merge pull request #2650 from FHenry/dev_pdfpropalmergeproductpdf · f7b2b00e
  Laurent Destailleur authored 9 years ago
  
  NEW : Propal merge PDF product attached files (on option)
  f7b2b00e
- Merge pull request #2647 from aternatik/fix_css · cb0e45d5
  Laurent Destailleur authored 9 years ago
  
  Fix : css properties for lists and input fields
  cb0e45d5
- Merge pull request #2649 from atm-maxime/develop · 6e136616
  Laurent Destailleur authored 9 years ago
  
  Alert when oustanding amount excedeed
  6e136616
- Merge pull request #2651 from aternatik/fix_email_template · 6b934001
  Laurent Destailleur authored 9 years ago
  
  Fix : bad usage of empty function with GETPOST
  6b934001
- Typo · ecf1fbe5
  Maxime Kohlhaas authored 9 years ago
  
  ecf1fbe5
- Fix : bad usage of empty function with GETPOST · bee5af4d
  Jean-François Ferry authored 9 years ago
  
  bee5af4d
- Fix : unit price without tax is now subprice (not pu_ht) · c3bcda74
  Maxime Kohlhaas authored 9 years ago
  
  c3bcda74
- Merge branch 'develop' into dev_pdfpropalmergeproductpdf · 62ef9743
  Florian Henry authored 9 years ago
  
  62ef9743
- Fix: solves #2644 · c5d8fa46
  Juanjo Menent authored 9 years ago
  
  c5d8fa46
- Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop · e704e037
  Florian Henry authored 9 years ago
  
  e704e037
- Alert when oustanding amount excedeed · 2ddef9ff
  Maxime Kohlhaas authored 9 years ago
  
  2ddef9ff
- Typo · 53469c80
  Maxime Kohlhaas authored 9 years ago
  
  53469c80
- Adjust CSS : missing color for input, textarea and select list · 4f0829d4
  Jean-François Ferry authored 9 years ago
  
  4f0829d4
- Merge pull request #2636 from defrance69/patch-59 · e4656ecf
  Laurent Destailleur authored 9 years ago
  
  NEW Add list of orders into commercial page
  e4656ecf
- Adjust CSS properties for tables · c5b191d5
  Jean-François Ferry authored 9 years ago
  
  c5b191d5
- Don't show 'undifined' when no max delivery time · c5599efe
  Francis Appels authored 9 years ago
  
  c5599efe
- Fix Lang part2 · 308ee401
  Francis Appels authored 9 years ago
  
  Fix lang in en_us
  308ee401
- Merge pull request #2645 from atm-maxime/develop · 07bf4033
  Laurent Destailleur authored 9 years ago
  
  Fix : outstanding limit was not saved
  07bf4033
- Fix : outstanding limit was not saved · 8e4771da
  Maxime Kohlhaas authored 9 years ago
  
  8e4771da
- Merge pull request #2639 from aternatik/stable_resource · e1403b13
  Laurent Destailleur authored 9 years ago
  
  New : mark resource module as stable
  e1403b13
- Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop · db2acb7c
  Florian Henry authored 9 years ago
  
  db2acb7c
- Merge pull request #2642 from GPCsolutions/editorconfig · 97fe9092
  Laurent Destailleur authored 9 years ago
  
  Dolibarr uses tab indents
  97fe9092
- Merge pull request #2637 from grandoc/develop · 3edfbf1a
  Laurent Destailleur authored 9 years ago
  
  fix syntax errors
  3edfbf1a
- NEW : Propal merge product card PDF into azur · e15d4c04
  Florian Henry authored 9 years ago
  
  e15d4c04
- Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop · 838329f3
  Philippe Grand authored 9 years ago
  
  838329f3
- Dolibarr uses tab indents · 81a14b5b
  Raphaël Doursenaud authored 9 years ago
  
  81a14b5b
- New : mark resource module as stable · 5c4633d5
  Jean-François Ferry authored 9 years ago
  
  5c4633d5
- Merge · 08dfcf3a
  Laurent Destailleur authored 9 years ago
  
  08dfcf3a
- Fix: error when deleting resource · f2e19f23
  Jean-François Ferry authored 9 years ago
  
  f2e19f23
- fix syntax errors · eaf0fda6
  Philippe Grand authored 9 years ago
  
  eaf0fda6
- Fix PHPCS · ca05c9a2
  Laurent Destailleur authored 9 years ago
  
  ca05c9a2