Commit Graph

30252 Commits

Author SHA1 Message Date
Laurent Destailleur
8af34ee97e Fix: Bad property 2013-02-17 18:40:09 +01:00
Laurent Destailleur
b21cb5b899 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture.php
	htdocs/filefunc.inc.php
2013-02-17 17:25:38 +01:00
Laurent Destailleur
df2fde3a68 Prepare 3.3 release 2013-02-17 17:17:19 +01:00
Laurent Destailleur
9a951e4d6d Fix: When creating invoice from other object, type must be standard only 2013-02-17 17:12:19 +01:00
Laurent Destailleur
b434f58af3 Fix: When creating invoice from other object, type must be standard only 2013-02-17 17:12:06 +01:00
Laurent Destailleur
d2074d1a17 Fix: When creating invoice from other object, type must be standard only 2013-02-17 17:06:55 +01:00
Laurent Destailleur
e56e182fe9 Fix: When creating invoice from other object, type must be "standard". 2013-02-17 16:37:28 +01:00
Laurent Destailleur
9f8ffe242a Fix: A text field can not have a default value 2013-02-17 16:26:06 +01:00
Laurent Destailleur
aa8413d7cb Fix: Missing migration
Fix: Error management
2013-02-17 16:20:49 +01:00
Laurent Destailleur
aff919fd10 Fix: Bad test 2013-02-17 12:45:46 +01:00
Laurent Destailleur
249a03dd57 Merge pull request #659 from jfefe/extrafields
Work on extrafields
2013-02-16 14:19:24 -08:00
Laurent Destailleur
42b37c081a Merge pull request #648 from cbattarel/fix_contact_address_autofill
fix contact address autofill
2013-02-16 14:19:08 -08:00
Laurent Destailleur
fdf8c9dc43 Merge pull request #657 from defrance69/patch-12
Update htdocs/product/class/product.class.php
2013-02-16 14:18:17 -08:00
Laurent Destailleur
4dca883f21 Merge pull request #655 from FHenry/develop
Task 714 and  	Fix bug on task 350
2013-02-16 14:16:08 -08:00
Laurent Destailleur
2ea62073b6 Merge pull request #660 from grandoc/develop
fix : doesn't work with a /
2013-02-16 14:14:30 -08:00
Laurent Destailleur
50decdd941 Fix: When creating user on other entity, no way to read user
after creation.
2013-02-16 21:06:15 +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
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
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
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
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