Commit Graph

3149 Commits

Author SHA1 Message Date
Laurent Destailleur
8d2d64e9ae No message when not required 2013-03-13 16:22:11 +01:00
Laurent Destailleur
390921512c Move info message on top right 2013-03-12 15:56:47 +01:00
Laurent Destailleur
e1bf659db5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-11 16:49:37 +01:00
Laurent Destailleur
5bc66318c2 New: use dolGetFirstLastname() everywher we should. 2013-03-11 15:54:01 +01:00
jfefe
ba8525bd6a Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into extrafields
Conflicts:
	htdocs/install/doctemplates/invoices/template_invoice.odt
	htdocs/install/doctemplates/proposals/template_proposal.odt
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-03-11 05:21:35 +01:00
Laurent Destailleur
746e005726 Fix: Fix ton of regression due to field name change 2013-03-09 20:34:38 +01:00
jfefe
1690c77aa2 Merge branch 'extra_invoice' into extrafields
Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-03-07 01:48:27 +01:00
Laurent Destailleur
d92fd0eaed New: Add table, dictionnary and option to enable "revenue stamp". 2013-03-06 16:09:00 +01:00
jfefe
88a042ec41 Prepare invoice admin page to add extrafield support 2013-03-06 03:36:43 +01:00
jfefe
7d3c35fb90 Merge branch 'extra_propal' into extrafields 2013-03-06 01:41:47 +01:00
Laurent Destailleur
9bced140e6 More explanation onto the php session parameter. 2013-03-06 00:45:43 +01:00
jfefe
f335c4f306 New : add extrafield support on propal object 2013-03-04 18:22:25 +01:00
fhenry
c29602382d Taking account remark on pull request da17302 2013-03-04 16:59:39 +01:00
fhenry
da17302349 [ task #743 ] GED : Add aministration option to disabled autotree to
display
2013-03-04 11:16:46 +01:00
Laurent Destailleur
562ea22304 Qual: Better error management 2013-03-01 18:10:19 +01:00
Laurent Destailleur
f2371be191 Fix: Update button does not appear 2013-02-27 15:24:08 +01:00
Laurent Destailleur
f294ea5fb0 Fix: Update button does not appear 2013-02-27 15:23:25 +01:00
Grand Philippe
44683a0e21 english language standardization 2013-02-27 11:58:50 +01:00
Laurent Destailleur
283aeb2945 Fix: Add option MAIN_USE_LOCALTAX_TYPE_7 to hide localtax 7 because
type 7 need to be implemented at invoice level, not line level. This
disable the feature (we need better implementation) without removing it
for people using it in the past.
2013-02-27 01:06:08 +01:00
Laurent Destailleur
029dec126d Fix: Add option MAIN_USE_LOCALTAX_TYPE_7 to hide localtax 7 because
type 7 need to be implemented at invoice level, not line level. This
disable the feature (we need better implementation) without removing it
for people using it in the past.
2013-02-27 01:05:16 +01:00
Laurent Destailleur
402fe2e417 Merge remote-tracking branch 'origin/3.3' into develop 2013-02-26 20:05:23 +01:00
Grand Philippe
79c2e17cbb english language standardization 2013-02-25 17:56:41 +01:00
Grand Philippe
b081589129 english language standardization 2013-02-25 09:52:24 +01:00
Grand Philippe
6decab1847 english language standardization 2013-02-25 09:17:38 +01:00
Grand Philippe
d27568d3d0 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-25 08:16:43 +01:00
Laurent Destailleur
b4329cb5d2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-24 18:22:57 +01:00
Laurent Destailleur
fe4ef69360 Fix: Duplicate form 2013-02-24 18:08:52 +01:00
Grand Philippe
86de772b31 english language standardization 2013-02-24 17:08:52 +01:00
Grand Philippe
6adc9eb7f2 english language standardization 2013-02-23 17:40:28 +01:00
Laurent Destailleur
4dbf5a20ad Merge pull request #687 from frederic34/develop
WIP : Admin for Carriers
2013-02-23 07:38:55 -08:00
frederic34
9333fdb97f WIP : Admin for Carriers 2013-02-23 15:23:33 +01:00
Laurent Destailleur
37b94e43c8 Merge pull request #685 from frederic34/develop
WIP : Admin for Carriers
2013-02-23 03:11:52 -08:00
frederic34
c8872d7e98 WIP : Admin for carriers 2013-02-23 10:20:31 +01:00
Grand Philippe
182fdbce32 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-23 10:04:31 +01:00
Laurent Destailleur
1224e79ee3 Qual: Start to clean how menu managers works. 2013-02-22 19:16:03 +01:00
Grand Philippe
a582fd3f15 english standardization 2013-02-22 16:14:52 +01:00
Grand Philippe
fc4ad12a72 english standardization 2013-02-22 15:57:30 +01:00
fhenry
44b5b98308 Fix [ bug #733 ] 2013-02-22 15:02:06 +01:00
frederic34
67c06225a5 WIP : Admin for carriers 2013-02-22 14:18:51 +01:00
Grand Philippe
0af5c434af english standardization 2013-02-22 09:29:34 +01:00
frederic34
d26024d8fc WIP : Admin for Carriers (Activate/Desactivate) 2013-02-21 23:40:25 +01:00
Laurent Destailleur
2852aded3a New: Add button collapse/expand for menu, category and user views. 2013-02-20 21:16:31 +01:00
Laurent Destailleur
320b4bde1f Qual: Code to output tree is now generic 2013-02-20 19:01:29 +01:00
Laurent Destailleur
6db881c09d New: Add link collapse all - expand all.
Fix: Add missing images.
2013-02-20 18:34:54 +01:00
Laurent Destailleur
9ddd6215f8 Qual: Replace native code with jquery plugin treeview. 2013-02-19 20:15:30 +01:00
Laurent Destailleur
95098a9b59 Fix: Menu editor 2013-02-19 15:23:25 +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
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