lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,078 Commits 43 Branches 150 Tags 886 MiB
06398d9077
Commit Graph

35078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jfefe
06398d9077 Fix : bad name of property when retrieve extrafields for thirdparty 2013-02-17 14:37:33 +01:00
jfefe
b9caff8dd0 Merge branch 'extra_odt' into fgd 2013-02-16 13:59:00 +01:00
jfefe
4f5b636cc7 Fix : missing class file 2013-02-16 13:58:21 +01:00
jfefe
9d70a8b1c5 Merge branch 'extra_odt' into fgd 2013-02-16 03:42:20 +01:00
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
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
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
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
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
jfefe
6905e05471 Fix : bad method name for prospect status 2013-02-14 16:00:22 +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
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
Christophe Battarel
4f33249c9e margin management on contract card 2013-02-13 10:35:47 +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
fhenry
6ad617842d Commit temporaire 2013-02-12 15:31:12 +01:00
Laurent Destailleur
6bbac00c22 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/user/fiche.php
 2013-02-12 15:17:22 +01:00
Laurent Destailleur
4c936ffffd Merge pull request #645 from FHenry/dev_contactcombox 
Task [ task #711 ]
 2013-02-12 06:08:04 -08:00
Laurent Destailleur
ddf27b2c67 Fix Bug 708 2013-02-12 15:01:16 +01:00
Laurent Destailleur
8a72ff8fc2 Fix: bad translation 2013-02-12 14:48:51 +01:00
Laurent Destailleur
112526e8b1 Fix: bad translation 2013-02-12 14:48:12 +01:00
fhenry
d8d4b669ab Task [ task #711 ] 2013-02-12 09:49:27 +01:00
Laurent Destailleur
82dda5723b Fix: Disable autocomplete 2013-02-12 01:29:26 +01:00
Laurent Destailleur
935f2d9bd8 Add TODO 2013-02-11 21:23:25 +01:00
Laurent Destailleur
c7a6ee492d New: Add push from Philippe to manager user hierarchy. 2013-02-11 20:45:36 +01:00
Laurent Destailleur
f1d105b66c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-11 20:27:11 +01:00
Laurent Destailleur
597db12acd Merge pull request #644 from simnandez/develop 
Fix: Amarok login page issues
 2013-02-11 11:26:48 -08:00
Laurent Destailleur
4ceeadaa35 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-11 20:26:18 +01:00
Laurent Destailleur
d2275a0bbd New: Add param to show title 2013-02-11 20:26:01 +01:00
simnandez
77c5eaa726 Fix: Amarok login page issues 2013-02-11 09:13:33 +01:00
Laurent Destailleur
fed591d989 Merge pull request #641 from simnandez/3.3 
Fix: Amarok login page issues
 2013-02-10 17:37:38 -08:00
Laurent Destailleur
638871c40c Merge pull request #640 from defrance69/patch-11 
Update htdocs/product/class/product.class.php
 2013-02-10 17:36:27 -08:00