Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
34,898 Commits 39 Branches 191 Tags
e0bf4faa4cd2c7b2fb6e0187f9248ee6890518ea
Commit Graph

34898 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
e0bf4faa4c Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-03-27 20:49:30 +01:00
Laurent Destailleur
0108ee2bd8 Fix: Bad name of function 2013-03-27 20:48:57 +01:00
Regis Houssin
c36f52c47a Fix: avoid errors due to BROKEN FEATURES !!! 2013-03-27 11:54:10 +01:00
Regis Houssin
a701cbd77c Fix: wrong var name 2013-03-26 17:47:37 +01:00
Regis Houssin
4fe94b800b Fix: missing parameter 2013-03-26 17:43:48 +01:00
Regis Houssin
dff74667c2 Fix: broken features due to the removal of the trigger FILE_UPLOAD ! 2013-03-26 17:29:40 +01:00
Regis Houssin
33a82c396e Fix: broken feature for use hooks with dol_move_uploaded_file method 2013-03-26 17:12:00 +01:00
Laurent Destailleur
7f4fd06f19 Merge pull request #761 from cbattarel/3.3 
fix getting buying price when creating automatically an order from a proposal
 2013-03-20 07:31:31 -07:00
Christophe Battarel
c7666cbc3d fix getting buying price when creating automatically an order from a proposal (with first option activated in workflow module) 2013-03-20 09:30:13 +01:00
Laurent Destailleur
f4996b4054 Merge pull request #757 from cbattarel/3.3 
remove experimental commissions module
 2013-03-19 19:18:38 -07:00
Christophe Battarel
e2f28b6c51 remove experimental commissions module 2013-03-18 15:40:56 +01:00
Laurent Destailleur
8a6adb8a49 Merge pull request #756 from cbattarel/3.3 
various fixes on margin :
 2013-03-18 06:25:54 -07:00
Christophe Battarel
f8291a9efe use ifsql function 2013-03-18 14:18:17 +01:00
Christophe Battarel
e59084cafc various fixes on margin : 
- fix on sortorder
- fix for credit notes
- fix for total
 2013-03-18 13:04:08 +01:00
Laurent Destailleur
d2d0f83fa0 Merge pull request #754 from simnandez/3.3 
Trad:  Fix: A better fix for status/list of orders.
3.3.1 		2013-03-17 06:30:10 -07:00
simnandez
54f963f8ae Trad: Fix: A better fix for status/list of orders. 
There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".
 2013-03-16 22:32:03 +01:00
Laurent Destailleur
013b7eca10 Fix: A better fix for status/list of orders. 
There was a confusion because of bad translation key StatusOrderToBill
that in fact mean "StatusOrderDelivered".
More explanation:
http://wiki.dolibarr.org/index.php/Module_Customers_Orders#Life_cycle_.2F_Business_rules
 2013-03-16 17:02:13 +01:00
Laurent Destailleur
d590aa56eb Merge pull request #749 from simnandez/3.3 
Fix: Bad orders list viewstatut filter if expeditons module is disabled
 2013-03-16 07:39:31 -07:00
Laurent Destailleur
1a62cdfbe8 Fix: Use better test to show localtax to avoid problem when switching 
from different country.
 2013-03-15 17:06:42 +01:00
simnandez
c0e5cacafc Fix: Bad orders list viewstatut filter if expeditons module is disabled 2013-03-15 16:18:14 +01:00
Laurent Destailleur
ed85869394 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-03-15 14:43:41 +01:00
Laurent Destailleur
a5181a06e4 Merge pull request #747 from grandoc/3.3 
fix trad
 2013-03-15 04:33:02 -07:00
Grand Philippe
36e99e100b fix trad 2013-03-15 12:13:23 +01:00
Laurent Destailleur
63e3b5742c Merge pull request #745 from grandoc/3.3 
fix trad
 2013-03-15 04:02:48 -07:00
Laurent Destailleur
1ac78d0e83 Merge pull request #744 from FHenry/3.3 
Fix part of bugs [ bug #766 ]
 2013-03-15 04:02:34 -07:00
Laurent Destailleur
95c9d19d5e Fix: Restore ability to filter on '0' 2013-03-15 11:31:49 +01:00
Grand Philippe
010207532f fix trad 2013-03-15 10:12:40 +01:00
fhenry
72effa3f25 Fix part of bugs [ bug #766 ] 2013-03-15 09:31:11 +01:00
Regis Houssin
d6c18c1789 Fix: for avoid sql errors with predefined export models 2013-03-14 07:08:44 +01:00
Laurent Destailleur
55856bdc36 Merge pull request #741 from grandoc/3.3 
fix trad
 2013-03-13 08:52:56 -07:00
Laurent Destailleur
6fc57fb90d Merge pull request #740 from FHenry/3.3 
Fix syntax error
 2013-03-13 08:52:25 -07:00
Laurent Destailleur
96013ba9a6 Merge pull request #739 from jfefe/ws_3.3 
Missing field fk_thirdparty in user webservice
 2013-03-13 08:51:36 -07:00
Grand Philippe
82297f52c9 fix trad 2013-03-13 14:40:16 +01:00
Grand Philippe
2d09eb6f8c fix trad 2013-03-13 12:22:39 +01:00
Grand Philippe
5ed94ae9be fix trad 2013-03-13 11:10:31 +01:00
fhenry
d4621c3921 Fix syntax error 2013-03-13 10:15:37 +01:00
jfefe
c83691e35a Missing field fk_thirdparty in user webservice 2013-03-12 20:57:58 +01:00
Laurent Destailleur
bb2776f4cc Fix: Bad field 2013-03-12 13:37:34 +01:00
Laurent Destailleur
9c1f70996a Merge pull request #731 from grandoc/3.3 
fix some translations
 2013-03-12 05:27:15 -07:00
Laurent Destailleur
b88d261c90 Merge pull request #735 from simnandez/3.3 
Fix: [ bug #762 ] Bad profit calculation in Reporting
 2013-03-12 05:26:00 -07:00
simnandez
5c4b537a65 Fix: [ bug #762 ] Bad profit calculation in Reporting 2013-03-12 11:49:15 +01:00
Laurent Destailleur
fe072d992c Fix: WSDL of productorservice was not valid. Normalize field names. 2013-03-12 10:35:24 +01:00
Grand Philippe
dd248e9d58 fix : dyslexia 2013-03-11 17:19:03 +01:00
Grand Philippe
979a36e941 fix some translations 2013-03-11 15:18:24 +01:00
Grand Philippe
06e931632d fix some translations 2013-03-11 14:51:48 +01:00
Laurent Destailleur
710ea872a9 Merge pull request #727 from cbattarel/3.3 
fix wrong value name when updating buyingprice
 2013-03-11 06:25:35 -07:00
Laurent Destailleur
633a15f10d Fix: Usage of order into export broken when filters are used 2013-03-11 14:20:08 +01:00
Christophe Battarel
f620e6948f fix wrong value name when updating buyingprice 2013-03-11 09:08:57 +01:00
Laurent Destailleur
a6ce7bb428 Fix: Regression for negative proposal lines. 
Conflicts:
	htdocs/comm/propal.php
 2013-03-08 10:28:25 +01:00
Laurent Destailleur
44698fcde0 Fix: dol_is_dir may not be loaded, so call fails 2013-03-08 01:53:41 +01:00