2
0
forked from Wavyzz/dolibarr
Commit Graph

34721 Commits

Author SHA1 Message Date
jfefe
6aae37493c Add support of calendar on date type extrafield on propal 2013-03-29 22:14:06 +01:00
BENKE Charles
701814ad19 Update mysqli.class.php 2013-03-29 21:19:22 +01:00
Maxime Kohlhaas
2309a4b81b Fix : on holiday list on a specific user, user and validator were not displayed 2013-03-29 18:56:01 +01:00
Maxime Kohlhaas
d8090ba994 Fix : "Firstname" was used as var instead of "firstname" 2013-03-29 18:47:53 +01:00
Laurent Destailleur
e40909144d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-29 18:30:05 +01:00
Grand Philippe
11d2cb1e1c fix: ref_suplier instead of ref for add numbering for supplier invoice 2013-03-29 17:18:47 +01:00
Laurent Destailleur
97a90b0904 New: Add more ODT tags 2013-03-29 16:45:40 +01:00
Laurent Destailleur
ff5b2b3404 Merge pull request #786 from defrance69/patch-21
Update mysql.class.php
2013-03-29 08:32:17 -07:00
Laurent Destailleur
4c47393b51 Fix: Add more ODT tags 2013-03-29 16:18:55 +01:00
Laurent Destailleur
8f331adff6 New: Work on men management rewrite 2013-03-29 16:16:26 +01:00
Laurent Destailleur
006050b6cd Fix: left menu not always opened 2013-03-29 15:39:35 +01:00
Grand Philippe
f57320e697 add numbering for supplier invoice 2013-03-29 15:36:54 +01:00
jfefe
1a1aebf793 Display date extrafield with correct format 2013-03-29 14:56:31 +01:00
Laurent Destailleur
6702386b8b Some fix into chineese language files 2013-03-29 14:54:07 +01:00
jfefe
80f080f5a9 Format date for sql query
Using dol_print_date because db->idate doesn't work
2013-03-29 14:45:40 +01:00
jfefe
c1e6de33eb Fix : bad definition of key for extrafields array 2013-03-29 14:37:29 +01:00
jfefe
76ce938f61 When retrieve extrafields, loop on extralabels array instead of posted values
Add support for calendar display on date extrafield
2013-03-29 14:09:47 +01:00
jfefe
c53564c454 For extrafield with date type show calendar instead basic input field 2013-03-29 14:03:39 +01:00
Regis Houssin
1e3b26a104 Fix: file with a specific mask not found, again 2013-03-29 11:54:22 +01:00
Regis Houssin
888da9f3e9 Fix: file with a specific mask not found 2013-03-29 11:52:18 +01:00
jfefe
520e235207 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields 2013-03-29 10:44:35 +01:00
BENKE Charles
d5a1f64e76 Update mysql.class.php
some other problems about DDLCreateTable, other field setting not actived
2013-03-29 02:09:19 +01:00
Laurent Destailleur
2e3fd0083a Merge pull request #785 from FHenry/develop
Add more information in ODT project template
2013-03-28 15:40:46 -07:00
fhenry
e745cbb5cf Add missing column into llx_extrafield creation 2013-03-28 22:13:04 +01:00
fhenry
c2be118efd Add more information in ODT project template 2013-03-28 20:51:00 +01:00
Laurent Destailleur
8ad801d0b6 Merge pull request #784 from jfefe/extra_error
Better error management when add/update extrafields
2013-03-28 11:12:58 -07:00
Laurent Destailleur
4e97a41612 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-03-28 16:29:22 +01:00
Laurent Destailleur
3c3c0b456e Fix: _ not allowed into prestashop tags. 2013-03-28 09:59:59 +01:00
Sébastien de Chateauvieux
5921033f94 TVA NPR : Change field name recuperableonly to info_bits 2013-03-28 09:51:49 +04:00
jfefe
ed2b359dae Bad parameter when calling setEventMessage function 2013-03-28 06:48:21 +01:00
Sébastien de Chateauvieux
eda6187982 TVA NPR : can use * in tva when set supplier price 2013-03-28 09:30:42 +04:00
Laurent Destailleur
07062065e5 Merge pull request #782 from jfefe/propal_odt_choice
New : can choose to generate the ODT document according to the status of a propale
2013-03-27 13:35:34 -07:00
jfefe
013eac1147 Better error management when add/update extrafield
Usage of setEventMessage() function
2013-03-27 21:24:45 +01:00
Laurent Destailleur
15b7a63b7a Merge remote-tracking branch 'origin/3.3' into develop 2013-03-27 20:50:58 +01:00
Laurent Destailleur
e0bf4faa4c Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-03-27 20:49:30 +01:00
Laurent Destailleur
0108ee2bd8 Fix: Bad name of function 2013-03-27 20:48:57 +01:00
Laurent Destailleur
753bfdbec2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-27 20:43:43 +01:00
Laurent Destailleur
0a3b7e7994 New: Be able to get path of image without tag img 2013-03-27 20:43:28 +01:00
Regis Houssin
55757a6b82 Fix: $i is global 2013-03-27 20:42:55 +01:00
jfefe
0b7d13d463 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into extrafields 2013-03-27 20:39:56 +01:00
jfefe
1f5987b379 Fix trad & add english 2013-03-27 19:13:50 +01:00
jfefe
1f537300ea Add hidden option MAIN_PROPAL_CHOOSE_ODT_DOCUMENT to enable choice of ODT document to use according to his status 2013-03-27 19:11:42 +01:00
Laurent Destailleur
f27f601a73 Merge pull request #780 from FHenry/develop
Add information on Project ODT into ODT project
2013-03-27 07:56:33 -07:00
jfefe
ee52e1a487 Merge remote-tracking branch 'upstream/develop' into propal_odt_choice 2013-03-27 15:25:13 +01:00
jfefe
47b6829e17 Remove DOS EOF (dos2unix utility used) 2013-03-27 14:39:41 +01:00
Laurent Destailleur
6c1bbd3aeb New: Uniformize hooks. 2013-03-27 14:24:33 +01:00
Laurent Destailleur
a22d39adfb Fix: Hook is a replaceadd hook. 2013-03-27 14:11:15 +01:00
Laurent Destailleur
393cecb1c2 New: Add hook 2013-03-27 14:08:15 +01:00
Laurent Destailleur
982b3e9d66 Add trigger into delete line for supplier invoice 2013-03-27 13:59:45 +01:00
Laurent Destailleur
d8eafbf068 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-27 13:24:39 +01:00