Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
40,390 Commits 36 Branches 189 Tags
f34aadef3df57794de74006bc2c2c9fc4da6be12
Commit Graph

34721 Commits

Author SHA1 Message Date
Regis Houssin
afe339a2e2 Fix: strict mode 2012-11-07 12:00:17 +01:00
Regis Houssin
40725e72a5 Fix: missing spanish localtax values update 2012-11-07 11:49:28 +01:00
Laurent Destailleur
579544aa2f Add example of comment 2012-11-07 02:22:25 +01:00
Maxime Kohlhaas
7035ec42f1 Task # 559 : Modifications to store unitprice as in supplier prices 2012-11-07 00:38:53 +01:00
Laurent Destailleur
831fe6a29e Fix: More fix about the new localtax system 2012-11-06 23:45:16 +01:00
Maxime Kohlhaas
5586897f70 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into mko559 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-11-06 23:07:40 +01:00
Laurent Destailleur
7d01ea7fc3 Fix: Do not break dolibarr usage if log fails 2012-11-06 19:42:03 +01:00
Laurent Destailleur
fff8598282 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-06 19:30:38 +01:00
Laurent Destailleur
f37c559235 Fix: regression 2012-11-06 19:23:23 +01:00
Laurent Destailleur
9c8d653780 Merge pull request #477 from FHenry/develop 
Fix bug on mass mailling unsubsscribe fonctionnality
 2012-11-06 09:52:32 -08:00
Regis Houssin
869c6e1fda Merge pull request #478 from jfefe/webservices 
Minor improvement of webservice for product
 2012-11-06 08:44:03 -08:00
jfefe
8a69a258fd image information in webservice product : fix wrong objet 2012-11-06 16:18:26 +01:00
fhenry
e12999bcfd Correct fix 2012-11-06 15:39:47 +01:00
fhenry
9a3c7a230b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-11-06 15:36:44 +01:00
Laurent Destailleur
348674c438 Merge pull request #476 from simnandez/develop 
Fix: if no results do not charge data
 2012-11-06 06:26:50 -08:00
jfefe
8175a9a7e5 Add image information in webservice product 2012-11-06 15:16:49 +01:00
Regis Houssin
7de5a7fd3f Fix: compatibility with multicompany 2012-11-06 14:56:49 +01:00
fhenry
3651b8895e Fix bug on mass mailling unsubsscribe fonctionnality 2012-11-06 14:21:17 +01:00
simnandez
353c932e11 Fix: if no results do not charge data 2012-11-06 12:33:35 +01:00
jfefe
9eac0d06ec Add price_ttc value in product properties when call by webservice 2012-11-06 01:41:31 +01:00
Regis Houssin
8954422435 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-05 17:27:01 +01:00
Regis Houssin
72598bf4d4 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-05 17:25:57 +01:00
jfefe
8361cc29a1 Can have the thirdparty status 'active' when creating by webservices 2012-11-05 17:25:30 +01:00
Laurent Destailleur
ba56e679bd Fix: Calculation of default date for payment term was not using 
function.
 2012-11-05 17:21:05 +01:00
Laurent Destailleur
4cd1bbb0ca Fix: bad data init 2012-11-05 17:01:05 +01:00
Laurent Destailleur
027ad065a5 Removed TODO 2012-11-05 12:04:13 +01:00
jfefe
00ee6e9960 Can have the thirdparty status 'active' when creating by webservices 2012-11-05 03:49:17 +01:00
Laurent Destailleur
5d57677814 Fix: example 2012-11-04 21:20:27 +01:00
Laurent Destailleur
8896803921 New: We can use a dynamic value ($conf->global->XXX for example) into 
titles of menus.
New: Can choose menu entry to show with external site module.
 2012-11-04 21:19:12 +01:00
Laurent Destailleur
542b6f0731 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-04 19:32:30 +01:00
Laurent Destailleur
bebead8e54 Fix: To fix database integrity problems (I didn't find how 
orphelins appears, but they appears on some plateform).
 2012-11-04 19:32:14 +01:00
fhenry
1f41547dc2 Set unique key index unique in db (Conform to SQL standard) and needed 
for migration to other SGBD with key.sql file
 2012-11-04 15:55:12 +01:00
fhenry
be79c06c72 Set unique key index unique in db (Conform to SQL standard) and 
needed for migration to other SGBD
 2012-11-04 15:21:08 +01:00
Laurent Destailleur
80c252dd62 Fix: Use same labels to go back to draft than other elements. 
Re-open is for "closed" to a validated status.
Modify is for a validated status to draft.
 2012-11-03 21:33:55 +01:00
Laurent Destailleur
454b8b7279 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-03 21:14:38 +01:00
Laurent Destailleur
7e1a74cef1 Fix: If shipment is closed before delivery element is generated, there 
was no way to generate it again (dead lock situation).
 2012-11-03 21:14:23 +01:00
Regis Houssin
1722db223a Fix: add timepicker default options 2012-11-03 20:41:59 +01:00
Regis Houssin
77e45f70a4 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-03 19:16:02 +01:00
Regis Houssin
d0dc336a85 New: jQuery and jQuery UI upgrade 
New: jQuery Timepicker addon for Datepicker
 2012-11-03 19:15:45 +01:00
Laurent Destailleur
4c60740623 Do not loose input when there is a validation error. 2012-11-03 17:34:57 +01:00
Laurent Destailleur
e25fe89887 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-03 17:00:20 +01:00
Regis Houssin
076fa17593 Fix: missing colspan value 2012-11-03 16:58:50 +01:00
Laurent Destailleur
aae39ecb2e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-11-03 16:58:23 +01:00
Laurent Destailleur
0f2dac163f Fix: Bad label when validating/paying an invoice from POS module 2012-11-03 16:58:07 +01:00
Regis Houssin
a26ab0e8e1 Fix: add just colspan value 2012-11-03 16:51:41 +01:00
Laurent Destailleur
078b015db8 Work on multitax (vat). Need your test. 
Qual: Because params were often missing in calculate_price(), params are
now mandatory.
 2012-11-03 16:32:49 +01:00
Laurent Destailleur
135a622076 Fix: Bad parameter 2012-11-03 15:35:11 +01:00
Laurent Destailleur
af0c1a5f76 Fix: Missing parameter 2012-11-03 15:33:49 +01:00
Laurent Destailleur
7f2c6dc6eb Only code comments 2012-11-03 14:44:06 +01:00
Laurent Destailleur
19c617e4a0 Fix: Solve double ";;" 2012-11-03 13:49:31 +01:00