Commit Graph

55188 Commits

Author SHA1 Message Date
Laurent Destailleur
07d0f457b4 Fix: files generated by mass action could not be loaded 2016-07-23 12:44:28 +02:00
Laurent Destailleur
d7f557c7ed Remove warning 2016-07-22 18:34:50 +02:00
Laurent Destailleur
5bbd8eded9 Code comment 2016-07-22 18:32:45 +02:00
Laurent Destailleur
c0d8bce2df Prepare 3.8.5 2016-07-21 19:44:25 +02:00
Laurent Destailleur
1624894346 Fix missing load 2016-07-21 19:35:45 +02:00
Laurent Destailleur
f90946dbde Fix test on eat and sell date 2016-07-21 19:12:05 +02:00
Laurent Destailleur
80d99651a4 Merge remote-tracking branch 'origin/3.9' into 4.0
Conflicts:
	htdocs/product/stock/tpl/stockcorrection.tpl.php
2016-07-21 18:49:10 +02:00
Laurent Destailleur
3a08a14d56 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-07-21 18:45:53 +02:00
Laurent Destailleur
80354cd8d6 FIX Can correct stock of lot using eatby or sell by date 2016-07-21 18:43:44 +02:00
Laurent Destailleur
2d037eb34e FIX Direction of movement lost if an error occurs 2016-07-21 18:36:43 +02:00
Laurent Destailleur
441a8c4a74 FIX Can make a movement on "out of sell" products 2016-07-21 18:28:06 +02:00
Juanjo Menent
ae18178d56 Fix Performance improvement with many extrafields 2016-07-21 18:21:09 +02:00
Laurent Destailleur
42be661b1d Fix bad error message output 2016-07-21 17:36:59 +02:00
Laurent Destailleur
d71754f577 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-07-21 13:49:32 +02:00
Laurent Destailleur
058c431483 FIX The project was lost when creating the event "sent by email". Also,
event company "create" was not tracked by default like others.
2016-07-21 13:49:10 +02:00
Laurent Destailleur
ff9b2803e7 Fix if previous percent not defined, we do not try to show previous
percent.
2016-07-21 12:15:53 +02:00
Laurent Destailleur
0428d9c887 Merge pull request #5525 from aspangaro/4.0-p36
Fix: Presentation on thirdparty card
2016-07-21 10:42:56 +02:00
Laurent Destailleur
774e327831 Merge remote-tracking branch 'origin/3.9' into 4.0
Conflicts:
	htdocs/comm/remx.php
	htdocs/compta/facture.php
	htdocs/langs/en_US/companies.lang
2016-07-21 10:30:51 +02:00
Laurent Destailleur
972d998f7e Merge remote-tracking branch 'origin/3.8' into 3.9 2016-07-21 10:25:03 +02:00
Laurent Destailleur
9ebe704506 Merge pull request #5422 from atm-alexis/FIX_3.9_bug_5128
FIX #5128 if create method return duplicated code error
2016-07-21 09:55:26 +02:00
aspangaro
52e5403660 Fix: Presentation on thirdparty card 2016-07-21 06:25:25 +02:00
Laurent Destailleur
6e1d7aebb3 Merge pull request #5504 from simnandez/4.0
Fix bad param name to test if showing selector for suppliers
2016-07-20 18:15:54 +02:00
Laurent Destailleur
918bc9cc26 Fix: If user can approve, show button to deny to. 2016-07-20 16:07:15 +02:00
Laurent Destailleur
ffa1102949 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-07-20 02:16:22 +02:00
Laurent Destailleur
01c140ecac FIX External user must not be able to edit its discounts 2016-07-20 02:16:10 +02:00
Laurent Destailleur
455add4130 Merge pull request #5505 from atm-florian/3.9_fix_editbank_invoice
FIX : cannot update bank account on invoice if module order not activated
2016-07-19 18:24:40 +02:00
florian HENRY
5ea72c8d56 FIX : cannot update bank account on invoice if module order not
activated
2016-07-19 07:46:27 +02:00
Juanjo Menent
7479933c27 Merge remote-tracking branch 'upstream/4.0' into 4.0 2016-07-18 18:44:45 +02:00
Juanjo Menent
c5ebb8f983 Fix bad param name to test if showing selector for suppliers 2016-07-18 18:44:05 +02:00
Laurent Destailleur
038526bb71 Code comment 2016-07-18 14:40:10 +02:00
Laurent Destailleur
fd7c494cb6 Add VAT for cyprus 2016-07-18 13:20:04 +02:00
Laurent Destailleur
2c77a901b3 Fix to avoid removal of trnaslation key to keep 2016-07-18 12:55:44 +02:00
Laurent Destailleur
621a29d0e0 Fix account may contains text 2016-07-18 12:01:25 +02:00
Laurent Destailleur
10cd5ba730 Fix sort of sent notification by date desc 2016-07-18 11:54:35 +02:00
Laurent Destailleur
9a0367db0d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-07-18 11:51:51 +02:00
Laurent Destailleur
5e654e8cb3 Fix help 2016-07-18 11:49:34 +02:00
Juanjo Menent
e5235be7d0 Merge pull request #5500 from atm-florian/4.0_fix_updateline_multicurrency
FIX : class FactureLine fetch() and update() crash
2016-07-18 08:56:15 +02:00
florian HENRY
d3344f5291 sd 2016-07-18 07:48:32 +02:00
florian HENRY
bc4674bdce fix problem with call update method after fetch on invocie lines 2016-07-18 07:37:18 +02:00
Juanjo Menent
c37c3d1939 Merge pull request #5496 from olsesacl/3.8_#5450
Fix #5450 Bug: Expenses Form : SQL error on updating line
2016-07-17 15:46:03 +02:00
Laurent Destailleur
bf67cf9dc2 Update documentation 2016-07-17 13:40:14 +02:00
Laurent Destailleur
1914b98375 Merge remote-tracking branch 'origin/3.9' into 4.0 2016-07-17 12:52:20 +02:00
Laurent Destailleur
4382724b86 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-07-17 12:48:27 +02:00
Laurent Destailleur
9b47d7e05d Keep only us file 2016-07-17 12:46:09 +02:00
Sergio Sanchis Climent
e52d6db3fd Fix #5450 2016-07-17 12:18:29 +02:00
Juanjo Menent
60384f6d66 Merge pull request #5492 from simnandez/3.8
FIX #5474 Country_id of "Don" object is still empty
2016-07-17 09:45:56 +02:00
Juanjo Menent
970d088510 Merge pull request #5494 from EuskalMoneta/bug-5493
FIX #5493 The login field is ignored when doing a "search in all" for members
2016-07-17 09:45:16 +02:00
Juanjo Menent
9973f03f3b Merge pull request #5499 from aspangaro/4.0-p34
Fix: Accountancy - Problem with empty accountancy acccount in create / update mode
2016-07-17 09:37:01 +02:00
Juanjo Menent
5eeb630a14 Merge pull request #5498 from aspangaro/4.0-p35
Fix: Missing key language on home for boxes
2016-07-17 09:35:35 +02:00
aspangaro
90a84335ab Fix: Missing key language on home for boxes 2016-07-17 07:34:19 +02:00