Commit Graph

32306 Commits

Author SHA1 Message Date
Christophe Battarel
d32091120b margin management for orders 2012-07-19 10:26:26 +02:00
Christophe Battarel
b5c92c7b46 correction in getlinesarray 2012-07-19 10:15:59 +02:00
Christophe Battarel
019b857784 correct display of margin resume table 2012-07-19 09:55:43 +02:00
Christophe Battarel
9a7935075c correct margin informations when buy_price at zero 2012-07-18 17:29:32 +02:00
Christophe Battarel
8e2fee02df correct default definition for buy_price_ht in migration script 2012-07-18 17:17:00 +02:00
Christophe Battarel
f0f52270a5 adapt to new structure 2012-07-18 17:13:29 +02:00
Christophe Battarel
efba33eb13 adapt to new module structure 2012-07-18 17:00:56 +02:00
Christophe Battarel
411bb993b5 correct path to price.lib.php 2012-07-18 16:49:45 +02:00
Christophe Battarel
bd05495375 correct syntax error 2012-07-18 16:45:34 +02:00
Christophe Battarel
34022de1de correction of syntax error in tpl 2012-07-18 16:43:02 +02:00
Christophe Battarel
c5fe895dce adaptation to new module structure 2012-07-18 16:17:33 +02:00
Christophe Battarel
c12c8bd0bb update margin modules to core module 2012-07-18 16:13:29 +02:00
Christophe Battarel
3844a77395 correct typing bugs 2012-07-18 16:06:36 +02:00
Christophe Battarel
50c2a65b6a add margin infos to templates 2012-07-18 16:01:54 +02:00
Christophe Battarel
1de9dc15bf add margin module 2012-07-18 15:52:15 +02:00
Christophe Battarel
c0ac8c9ae1 fetch margin infos on line object 2012-07-18 15:50:37 +02:00
Christophe Battarel
316f6ce09c add margin infos to commonobject.class.php 2012-07-18 15:26:33 +02:00
Christophe Battarel
58262034cf add extra parameters to control combo in form_thirdparty like in select_company 2012-07-18 15:22:45 +02:00
Christophe Battarel
0cdf208f3d trigger change event when updating item value 2012-07-18 15:17:04 +02:00
Christophe Battarel
122fc5eaa7 update propales for margins 2012-07-18 15:15:54 +02:00
Christophe Battarel
a37707f96f updata database for margin module 2012-07-18 11:39:41 +02:00
Laurent Destailleur
9116db986f Fix: Restore button to edit products. Fix: the template to use for notes is dolibarr_notes. 2012-07-17 19:45:22 +02:00
Laurent Destailleur
7d9a4f2441 Make code simpler 2012-07-17 19:24:50 +02:00
Laurent Destailleur
73b17dc4c5 New: Make things more clear. 2012-07-17 15:28:34 +02:00
Laurent Destailleur
0021f7d98e New: Use a better format for workflow array:
- allow more complex permissions/conditions
- allow to define order of options
- can define workflow option not using two modules (can use only one, of
threee or more...)
2012-07-17 15:27:36 +02:00
Laurent Destailleur
86c59a2460 Better translation 2012-07-17 15:03:04 +02:00
Laurent Destailleur
1831b46bae Fix: Do not show if module disabled 2012-07-17 14:30:10 +02:00
Laurent Destailleur
393f407341 Update turkish language files 2012-07-17 02:33:14 +02:00
Laurent Destailleur
46d1c0a3fa New: Add option WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER
and WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER
2012-07-17 01:23:41 +02:00
Laurent Destailleur
d07e68e12f Fix: Combo list of warehouse not saved.
Fix: Validate of shipment in error
when using not predefined products.
2012-07-17 01:22:19 +02:00
Laurent Destailleur
06926e626a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-13 17:19:11 +02:00
Regis Houssin
7122b91203 Merge pull request #242 from simnandez/develop
Fix: Bad local taxes if price base type is TTC
2012-07-13 07:29:12 -07:00
Regis Houssin
4f458c01f4 Fix: missing entity filter 2012-07-13 16:23:47 +02:00
Laurent Destailleur
035b2d201b Fix: Translation 2012-07-13 16:17:30 +02:00
Laurent Destailleur
a953dbd01c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-13 16:13:24 +02:00
simnandez
b8338425f4 Trad: Add missing translations 2012-07-13 15:46:42 +02:00
Laurent Destailleur
ae08c49d13 Fix: due date and unit price into web service 2012-07-13 15:32:38 +02:00
simnandez
606674d8c8 Fix: Bad local taxes if price base type is TTC
Conflicts:
	htdocs/core/lib/price.lib.php
2012-07-13 15:28:25 +02:00
Regis Houssin
f16d204ca2 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-13 14:45:12 +02:00
Regis Houssin
221ecafe07 Fix: use click2dial only for phone tel 2012-07-13 14:45:00 +02:00
Laurent Destailleur
3fafecffbc Fix: field not saved into invoice creation 2012-07-13 14:06:51 +02:00
Regis Houssin
a1c86f52d7 Fix: strict mode holidays 2012-07-13 11:40:06 +02:00
Regis Houssin
77b9718473 Fix: strict mode street 2012-07-13 10:15:47 +02:00
Regis Houssin
94b7aed116 Fix: strict mode avenue 2012-07-12 19:14:13 +02:00
Laurent Destailleur
5a57070f6f Fix: Works whatever is number of lines into invoice 2012-07-12 18:12:02 +02:00
Laurent Destailleur
ee8b80813a Fix: Date not converted correctly when using web service 2012-07-12 17:07:56 +02:00
Laurent Destailleur
bea1a50e2c Fix: Phone not saved when using web service 2012-07-12 14:36:08 +02:00
Laurent Destailleur
f7eebc0502 Fix: Phone not saved when using web service 2012-07-12 11:58:44 +02:00
Regis Houssin
5b0719f402 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-11 18:14:20 +02:00
Regis Houssin
e1b0d183e4 Fix: add commonorder and commoninvoice classes 2012-07-11 18:13:41 +02:00