Commit Graph

47758 Commits

Author SHA1 Message Date
Laurent Destailleur
ffe4ae5915 Fix php7 compatibility 2016-10-31 21:24:23 +01:00
Laurent Destailleur
3882fa0c3d Fix dol_buildpath with parameter 3. Add phpunit tests 2016-10-31 10:37:58 +01:00
Laurent Destailleur
090f13afa4 Fix missing id param 2016-10-30 22:10:00 +01:00
Laurent Destailleur
b4303470f8 Fix do not update instance status if method used to update other element 2016-10-30 15:42:43 +01:00
Laurent Destailleur
2b873e34ce Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-10-29 19:01:19 +02:00
Laurent Destailleur
17c1b3f1d2 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
2016-10-29 19:00:43 +02:00
Laurent Destailleur
b8f8b6dcde Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-10-29 18:45:19 +02:00
Laurent Destailleur
78eaeab168 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-10-29 18:44:55 +02:00
Laurent Destailleur
7c75d98f9a FIX #5866 2016-10-29 18:43:12 +02:00
Laurent Destailleur
d675602291 Merge pull request #5925 from atm-ph/fix_4.0_fetch_multicurrency_by_code
Fix fetch multicurrency object from code must be filter by entity
2016-10-29 17:56:21 +02:00
Regis Houssin
d0bd1d5d36 Fix: missing path of user photo 2016-10-28 14:22:06 +02:00
Juanjo Menent
7acc14903c Merge pull request #5937 from atm-maxime/fix_supporder_vars_set
Fix : vars were not set after commande function
2016-10-28 11:18:15 +02:00
Maxime Kohlhaas
3dbab863a7 Fix : vars were not set after commande function 2016-10-28 10:24:31 +02:00
Maxime Kohlhaas
be493fcf09 Fix bad parameter in hook call 2016-10-28 10:16:58 +02:00
phf
3e2f39fbc0 Fix on first activate module it must create if needed the first currency rate from general settings 2016-10-25 13:31:36 +02:00
phf
a947ac55f9 Fix get multicurrency rowid from code must be filtered by entity 2016-10-25 12:45:23 +02:00
phf
1dc0dfc065 Fix fetch multicurrency object from code must be filter by entity 2016-10-25 12:07:34 +02:00
Sergio Sanchis Climent
2a4517e1bc FIX: #5907 2016-10-24 19:21:41 +02:00
Laurent Destailleur
6bd219b117 Fix column task ref/label 2016-10-24 17:47:31 +02:00
Laurent Destailleur
e4da87d31c Merge pull request #5903 from atm-gauthier/FIX_thirdparty_margin
FIX : margin tab on customer card must filter on current entity invoices
2016-10-24 03:18:37 +02:00
Laurent Destailleur
9560ec54cc Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/compta/facture/list.php
2016-10-24 02:15:12 +02:00
Laurent Destailleur
acf8874c6a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
Conflicts:
	htdocs/core/lib/functions.lib.php
2016-10-24 02:11:49 +02:00
Laurent Destailleur
a6c2758ca2 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
Conflicts:
	htdocs/core/lib/functions.lib.php
2016-10-24 02:10:17 +02:00
Laurent Destailleur
2f77549d2b Merge pull request #5897 from olsesacl/4-search-forun
FIX: Search provider by price
2016-10-24 02:04:01 +02:00
Laurent Destailleur
7dd3beaa5f Merge pull request #5893 from olsesacl/task_reference
FIX: Documents no change directory if change reference of the task.
2016-10-24 01:12:26 +02:00
Laurent Destailleur
8340316141 Merge pull request #5888 from olsesacl/trigger_expedition
Fix: Need declare $user for call trigger
2016-10-24 01:01:54 +02:00
Laurent Destailleur
6806bec859 Merge pull request #5882 from EuskalMoneta/bug-5849
FIX #5849 Loosing field company on member change
2016-10-24 00:12:25 +02:00
Laurent Destailleur
f0a183a8c7 Merge pull request #5905 from grandoc/4.0
Fix : Fatal error: Call to a member function fetch() on null for intervention
2016-10-24 00:11:51 +02:00
Rembert Oldenboom
65b986d9ec Revert "Cleanup"
This reverts commit 070980f5a6.
2016-10-23 17:04:21 +02:00
Rembert Oldenboom
070980f5a6 Cleanup 2016-10-23 16:59:57 +02:00
Rembert Oldenboom
9c6933a796 Fix pager 2016-10-23 16:53:45 +02:00
Laurent Destailleur
7ceb3cb62a FIX Avoid error 500 if phpexcel is disabled 2016-10-22 16:53:22 +02:00
Laurent Destailleur
ffcfe30529 FIX Avoid errors on debian 2016-10-22 16:51:54 +02:00
Laurent Destailleur
1c59721294 FIX Solve backup when using mysqldump that return warning 2016-10-22 16:20:51 +02:00
Laurent Destailleur
629af89986 FIX Solve backup when using mysqldump that return warning 2016-10-22 16:18:28 +02:00
philippe grand
14227549a8 Fix : Fatal error: Call to a member function fetch() on null 2016-10-21 16:03:56 +02:00
philippe grand
12af0de9f1 Merge remote-tracking branch 'upstream/4.0' into 4.0 2016-10-21 15:57:35 +02:00
Laurent Destailleur
c44aa8f4d7 Fix warnings 2016-10-21 13:23:39 +02:00
gauthier
a814e02d53 FIX : margin tab on customer card must filter on current entity invoices 2016-10-21 12:40:19 +02:00
Laurent Destailleur
3ca3b7ab78 Fix code comment 2016-10-21 10:36:11 +02:00
Sergio Sanchis Climent
78f1b428b0 FIX: Search provider by price 2016-10-19 21:42:53 +02:00
Sergio Sanchis Climent
4800918323 FIX: Documents no change directory if change reference of the task. 2016-10-18 23:17:45 +02:00
Laurent Destailleur
24ee2bce14 FIX Can edit the customer ref even if order is not draft. 2016-10-18 12:57:30 +02:00
Sergio Sanchis
81a31e8390 Fix: Need declare $user for call trigger 2016-10-18 10:52:07 +02:00
Juanjo Menent
f28c7bbc6d Fix: Bad localtaxes calc for Spain if VAT is 0. For >= 3.9.x 2016-10-18 10:20:09 +02:00
Juanjo Menent
6a944bb6a3 Fix: Bad localtaxes calc for Spain if VAT is 0 2016-10-18 10:11:42 +02:00
Laurent Destailleur
46c985d8cc FIX Hidden option PRODUCT_MAX_VISIBLE_PHOTO 2016-10-17 15:16:21 +02:00
Laurent Destailleur
47ed731242 Fix group by 2016-10-17 10:37:01 +02:00
Laurent Destailleur
2db38b4bcc Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/societe/list.php
2016-10-16 19:02:36 +02:00
Laurent Destailleur
ab34885a89 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-10-16 18:34:31 +02:00