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

30211 Commits

Author SHA1 Message Date
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
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
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
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
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
Laurent Destailleur
b112b7d87e Merge pull request #638 from grandoc/develop 
useless file
 2013-02-10 17:35:27 -08:00
Laurent Destailleur
4d9f22c909 Renamed "Salvador" into "El Salvador" 2013-02-10 22:09:25 +01:00
Laurent Destailleur
e5e9dc404b Fix: Bad choice of template 2013-02-10 21:57:53 +01:00
Laurent Destailleur
49f40ee429 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-10 21:56:44 +01:00
Laurent Destailleur
28fa96b516 Fix: Bad choice of template 2013-02-10 21:56:29 +01:00
simnandez
caf6fa2240 Fix: Amarok login page issues 2013-02-10 11:09:21 +01:00
BENKE Charles
f084bbbb19 Update htdocs/product/class/product.class.php 
bug on list of childs of product
if two products have the same label, the list display only one line
 2013-02-08 21:21:25 +01:00
Maxime Kohlhaas
717a834e8a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-02-08 13:51:05 +01:00
Maxime Kohlhaas
7c458777cf Task # 559 : product customer prices by quantity, correction 2013-02-04 10:21:59 +01:00
Grand Philippe
b492c7e754 fix some translations 2013-02-04 09:53:42 +01:00
Grand Philippe
4a4c7e9ca9 useless file 2013-02-04 08:54:04 +01:00
simnandez
ad91eab0ac [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 
Uniformize propal code (not use addpropal.php)
 2013-02-02 18:31:45 +01:00
simnandez
a9de14c145 Trad: Add missing translations 2013-02-01 17:49:41 +01:00
Laurent Destailleur
36eb0f01d8 Merge pull request #635 from simnandez/3.3 
Trad: Add missing translations
 2013-02-01 08:36:07 -08:00
Laurent Destailleur
1e74ac24ab Move message at bottom. 2013-02-01 17:34:19 +01:00
Laurent Destailleur
72c5652a4a Fix: Holiday module update always done 2013-02-01 10:13:42 +01:00
Laurent Destailleur
9f7a06e04d Fix: Test not complete 2013-02-01 09:56:45 +01:00
simnandez
7134ab5594 Trad: Add missing translations 2013-02-01 09:28:02 +01:00
Laurent Destailleur
26c66a11ed Fix: Bug 701 2013-01-31 10:21:34 +01:00