Commit Graph

55272 Commits

Author SHA1 Message Date
Laurent Destailleur
fda5e1e2b2 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-11-06 14:13:57 +01:00
Laurent Destailleur
75cc6bcf75 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-11-06 14:12:57 +01:00
Laurent Destailleur
f516660c0f Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-11-06 14:10:37 +01:00
Laurent Destailleur
73f0159578 Fix phpunit 2016-11-06 14:08:55 +01:00
Laurent Destailleur
73b5bad2da Fix missing hook init 2016-11-01 20:53:05 +01:00
Laurent Destailleur
6f061fc366 Fix css 2016-10-31 21:53:39 +01:00
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
3ff8a49e4f Fix english 2016-10-30 14:50:17 +01:00
Laurent Destailleur
f3a35c0045 Fix: do not publish files 'none' to Sourceforge 2016-10-30 14:14:10 +01:00
Laurent Destailleur
de52106265 Fix: do not publish files 'none' to Sourceforge 2016-10-30 14:11:08 +01:00
Laurent Destailleur
f605f0dc77 Prepare 4.0.2 2016-10-30 02:35:20 +02: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
7c3356baff Merge pull request #5938 from hregis/3.9_bug
Fix: missing path of user photo
2016-10-29 17:58:57 +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
Juanjo Menent
57a8e053b4 Merge pull request #5936 from atm-maxime/fix_pdfmuscadet_hook_call
Fix bad parameter in hook call
2016-10-28 11:17:21 +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
Laurent Destailleur
413796f1ee Merge pull request #5926 from atm-ph/fix_4.0_create_first_currency
Fix on first activate module it must create if needed the first curre…
2016-10-26 10:58:02 +02:00
Laurent Destailleur
5e7c72068d Merge pull request #5923 from olsesacl/#5907
FIX: #5907 No translation string for PDF Proposal
2016-10-26 10:56:15 +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
adb05ec05b Merge pull request #5887 from simnandez/3.9
Fix: Bad localtaxes calc for Spain if VAT is 0. For >= 3.9.x
2016-10-24 01:01:42 +02:00
Laurent Destailleur
fe71c0cb2d Merge pull request #5886 from simnandez/3.8
Fix: Bad localtaxes calc for Spain if VAT is 0
2016-10-24 01:01:04 +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
Laurent Destailleur
0b63cd867e Merge pull request #5913 from oldenboom/4.0
Fix donation list
2016-10-24 00:09:34 +02:00
Rembert Oldenboom
3304593c4d Merge branch 'fix_don_list' into 4.0 2016-10-23 17:12:30 +02:00
Rembert Oldenboom
246d09f979 Fix paging donations list 2016-10-23 17:11:55 +02:00
Rembert Oldenboom
25a29c8982 Revert "Cleanup"
This reverts commit 070980f5a6.
2016-10-23 17:04:43 +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