lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,390 Commits 43 Branches 150 Tags 886 MiB
f34aadef3d
Commit Graph

40390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
3c23a717fd Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/core/lib/files.lib.php
 2013-03-30 14:10:15 +01:00
Laurent Destailleur
e0baa0fe46 Generalize fix: file with a specific mask not found, again 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/expedition/fiche.php
	htdocs/fichinter/fiche.php
 2013-03-30 14:04:09 +01:00
Laurent Destailleur
a5e66ab7ba Generalize fix: file with a specific mask not found, again 2013-03-30 13:54:46 +01:00
Laurent Destailleur
c75ce97960 Update es_MX 2013-03-30 13:30:44 +01:00
Laurent Destailleur
3c248ce1fe Merge pull request #790 from jfefe/extrafields 
Work on task #784 : display calendar into data type extrafields
 2013-03-30 05:27:14 -07:00
Laurent Destailleur
7caa715fea Merge pull request #787 from grandoc/develop 
add numbering for supplier invoice
 2013-03-30 05:23:45 -07:00
Laurent Destailleur
656e61b77d Merge pull request #788 from atm-maxime/develop 
Fix : "Firstname" was used as var instead of "firstname"
 2013-03-30 05:21:38 -07:00
Laurent Destailleur
294cb2ab4f Merge pull request #789 from defrance69/patch-22 
same change on mysqldb
 2013-03-30 05:21:17 -07:00
jfefe
95d8ee8b41 Revert "Show number with dot to avoid error when update extrafield" 
This reverts commit 76efc04840.
 2013-03-30 10:49:52 +01:00
jfefe
e99ba51f1d Use of new function to set optionals from add / update form 
Format date display for data from JS calendar (date type extrafield)
 2013-03-30 10:46:23 +01:00
Grand Philippe
1ccdbbed5e Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-03-30 10:02:50 +01:00
jfefe
f3a7d497c6 Fix : missing object when calling function 2013-03-29 22:30:07 +01:00
jfefe
6c872395e3 Fix: syntax error 2013-03-29 22:26:25 +01:00
jfefe
60e72a770a Merge branch 'develop' into extrafields 2013-03-29 22:25:48 +01:00
jfefe
649c1f3721 Try new function to set array_options to object (extrafields values) with date sent by forms 2013-03-29 22:25:02 +01:00
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