Commit Graph

35296 Commits

Author SHA1 Message Date
jfefe
45f2347be3 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into fgd 2013-02-16 03:41:54 +01:00
jfefe
fa53147d0a Retrieve extrafields when fetch thirparty
Work on extrafields support in thirpdparty ODT document
2013-02-16 03:41:11 +01:00
Grand Philippe
ab2b06117b fix trad : change adresse versus address 2013-02-15 19:56:51 +01:00
Grand Philippe
785e72d533 fix trad : change adresse versus address 2013-02-15 19:36:09 +01:00
Grand Philippe
2bfd6c40d0 fix trad : change adresse versus address 2013-02-15 19:26:09 +01:00
Grand Philippe
12317d0371 fix trad : change adresse versus address 2013-02-15 19:18:26 +01:00
Laurent Destailleur
b1ee14ce60 New: Can define a hierarchical responsible on users. 2013-02-15 18:39:27 +01:00
Laurent Destailleur
145573ea79 Qual: Removed useless code for old modules. There is hook now to do same
job.
2013-02-15 17:37:30 +01:00
Grand Philippe
7c47dedbce fix trad: begin change address instead of adresse 2013-02-15 17:33:07 +01:00
Laurent Destailleur
e0bbb78f56 Fix: Merge customer and prospect tab 2013-02-15 17:28:07 +01:00
Laurent Destailleur
7260f39d21 New: Support tag total_vat_x.y for vat rate x.y into ODT templates 2013-02-15 17:06:32 +01:00
Grand Philippe
7c1a4e6fdf fix trad to get better understanding 2013-02-15 15:48:53 +01:00
Grand Philippe
cddd59d98d fix : doesnt work with a \/ 2013-02-15 14:23:35 +01:00
jfefe
21aa0b91fa Merge branch 'extrafields' into fgd
Conflicts:
	htdocs/core/admin_extrafields.inc.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
2013-02-15 11:23:49 +01:00
jfefe
3d8197ce4b Work on extrafields : position management & new type : select list 2013-02-15 11:19:49 +01:00
Laurent Destailleur
7b9fc49dea More CSS3 2013-02-15 10:46:50 +01:00
Laurent Destailleur
71b814156b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-15 10:42:50 +01:00
Laurent Destailleur
bbb18b3175 Look: More CSS3 2013-02-15 10:42:35 +01:00
BENKE Charles
f847558363 Update htdocs/product/class/product.class.php
fetch_prod_arbo / recursive call of the child product test
2013-02-15 07:21:10 +01:00
jfefe
14f21bc9f1 Add select list in extrafields type 2013-02-15 00:17:42 +01:00
jfefe
b57cb41d11 Add select list in extrafields type 2013-02-14 23:34:44 +01:00
fhenry
c02bd08711 Checkstyle 2013-02-14 16:35:54 +01:00
fhenry
ff214dd295 Manage tabs (add/remove by external module) for mass emalings screen 2013-02-14 16:25:43 +01:00
jfefe
6905e05471 Fix : bad method name for prospect status 2013-02-14 16:00:22 +01:00
fhenry
f65f0e3f11 Remove debug string in buf correction of task 350 2013-02-14 15:27:48 +01:00
fhenry
d41e754f43 Fix bug on task 350 2013-02-14 15:08:22 +01:00
fhenry
ebf002d79e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-02-14 14:59:24 +01:00
fhenry
2af7fd858e Task 714 2013-02-14 14:57:37 +01:00
fhenry
f043fcfaf7 Fix bug [ bug #709 ] 2013-02-14 13:55:05 +01:00
jfefe
3780d0fde6 New webservice method to change user password 2013-02-14 13:15:55 +01:00
jfefe
e2d03a9dba Add possibility to disable hook on list of recent file 2013-02-14 13:15:23 +01:00
Laurent Destailleur
365680d90e Fix: Missing vat rates 2013-02-13 21:25:17 +01:00
Laurent Destailleur
91215a075a Merge pull request #653 from atm-maxime/develop
Set draft function
2013-02-13 08:54:57 -08:00
Laurent Destailleur
031bc911ea Fix: Mass save or update of const fails. 2013-02-13 16:47:25 +01:00
Laurent Destailleur
f869004b95 Fix: Mass save or update of const fails. 2013-02-13 16:46:28 +01:00
Laurent Destailleur
7d1c51ab77 Add option MAIN_PDF_TITLE_BACKGROUND_COLOR 2013-02-13 16:45:53 +01:00
Maxime Kohlhaas
1cfd32680a Fix : set some vars when invoice is back to draft status 2013-02-13 15:43:27 +01:00
Maxime Kohlhaas
bfc5cfebce Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-02-13 15:42:41 +01:00
Laurent Destailleur
caec1429b1 Fix: Uniformize database type according to page http:// 2013-02-13 15:19:03 +01:00
Laurent Destailleur
eb1a903190 Merge pull request #651 from cbattarel/marges_contrat
Margin management on contracts
2013-02-13 06:02:19 -08:00
Laurent Destailleur
2dce0c68e8 Merge pull request #652 from cbattarel/3.3
3.3 : fix bug in contract update line (wrong vat variable name)
2013-02-13 05:56:09 -08:00
Christophe Battarel
4f33249c9e margin management on contract card 2013-02-13 10:35:47 +01:00
Christophe Battarel
c6b263c586 fix bug in contract update line (wrong vat variable name) 2013-02-13 09:53:26 +01:00
Christophe Battarel
44134dec57 prepare contract class for margin management 2013-02-13 09:50:08 +01:00
Christophe Battarel
b372a8c5ba prepare db for margin on contracts 2013-02-13 08:59:40 +01:00
Christophe Battarel
5c9950f486 prepare db for margin on contracts 2013-02-13 08:55:16 +01:00
Laurent Destailleur
7ab91b5f42 Merge pull request #650 from FHenry/develop_merger_cust_prospect_tab
Develop merger cust prospect tab (Task 350)
2013-02-12 11:41:17 -08:00
fhenry
136dc651f3 Merge branch 'develop' into develop_merger_cust_prospect_tab 2013-02-12 19:18:15 +01:00
fhenry
82fc8e1536 Task 350 in Doliforge 2013-02-12 19:16:48 +01:00
Laurent Destailleur
3eb485d521 Qual: Removed TODO, deprecated code and deprecated properties. This also
fix missing combo box of contacts onto CC.
2013-02-12 17:08:21 +01:00