Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
36,302 Commits 36 Branches 189 Tags
24a6321d45e9af6210b51aa9081f4825e76c4e45
Commit Graph

125 Commits

Author SHA1 Message Date
Laurent Destailleur
e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php
 2013-04-14 01:46:33 +02:00
fhenry
5d94b0c576 Fix bug : change path of ODT template for commande and propal module 2013-04-10 16:34:06 +02:00
fhenry
04e933c40f Fix : admin ODT doctemplate path commande/project 2013-04-09 21:58:25 +02:00
fhenry
98aaec18a7 Fix [ bug #810 ] Cannot update ODT template path 2013-04-08 18:08:38 +02:00
fhenry
6379b74099 Fix bug on ODT template path for order and projects 2013-04-08 18:02:12 +02:00
fhenry
dfcb38d13f [ task #793 ] Add extrafield feature into Orders module 2013-04-05 12:43:00 +02:00
Laurent Destailleur
350bcea183 Merge 2013-03-22 17:10:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
8709933288 Fix: Too much sanitizing 2012-11-03 00:47:09 +01:00
Laurent Destailleur
9c11092f46 Uniformize code 2012-09-05 11:15:38 +02:00
Laurent Destailleur
36571f1d54 Removed dead code 2012-09-03 10:39:21 +02:00
Marcos García
7c0463b215 Used incorrect translation keys 
Duplicated keys
 2012-08-29 00:29:47 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Marcos García
237d7b744c Including other.lang in files using FeaturesSupported string, also removed duplicated code 2012-07-30 20:39:47 +02:00
Laurent Destailleur
5b4b7f33ea Fix: Missing translation 2012-04-20 13:54:42 +02:00
simnandez
956eb11172 Fix: Sanitize data 2012-03-28 16:49:36 +01:00
Regis Houssin
3c794967c3 Fix: multiple avoid warning with php strict mode 2012-03-23 17:18:33 +01:00
Regis Houssin
ddedb68aeb Fix: php unit test warning 2012-03-05 07:59:00 +01:00
Laurent Destailleur
f241e338b3 Fix: Removed warning 2012-03-04 22:12:04 +01:00
Regis Houssin
f3cb926c3c Fix: use generic array for all parts 2012-03-01 13:58:33 +08:00
Laurent Destailleur
7c4e908639 models_modules isn't enough so we use same facture_invoice, 
commande_invoice, propale_invoice. This means module descriptor file
should contains
module_parts('facture'=>1) if we want to add doc template for invoice
into module/core/modules/facture/doc
 2012-03-01 02:06:08 +01:00
Regis Houssin
0b945f0716 Fix: use dol_buildpath 2012-03-01 04:10:50 +08:00
Laurent Destailleur
51fb1b2385 Fix: Code was sharing loop for custom dir and loop for subdir modules. 
The loop to manage customdir must be managed by the dol_buildpath so
only loop on / + module dir must be done.
 2012-02-29 20:07:17 +01:00
Regis Houssin
79c0369d66 Fix: possibility to use models of external modules 2012-03-01 01:24:00 +08:00
Regis Houssin
45ff7bddb3 New: Check if there is external models to do asked by plugins 2012-03-01 00:29:56 +08:00
Regis Houssin
637dca38e7 Fix: wrong constant 2012-02-13 11:01:34 +01:00
Laurent Destailleur
2093b3f0be New: Allow to use ODT templates for prososal like it's done for invoices 2012-02-05 19:37:52 +01:00
Grand Philippe
0c5f6d1f62 fix : display specimen 2012-02-03 00:24:35 +08:00
simnandez
15d1526393 [ task #176 ] Allow to use ODT templates. Works with Orders 2012-01-27 17:41:47 +01:00
Grand Philippe
ec3fc2c19e fix: specimen wasn't displayed when modele was in custom directory 2011-12-10 11:48:45 +01:00
Regis Houssin
f0c327c070 Fix: uniform code 
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
 2011-11-08 17:22:31 +08:00
Laurent Destailleur
8d46ae1d35 Qual: Better error managment on numbering setup 2011-11-06 15:12:18 +01:00
Regis Houssin
3338649316 [task #217] Move core files in core directory 2011-10-24 14:11:49 +02:00
Regis Houssin
63d60a33fc [task #216] Move lib in core directory 2011-10-24 11:25:54 +02:00
Laurent Destailleur
9d15365c25 For the "default" field, we keep usa of standard on and off button because it is not a feature we activate or not but a choice of one line among others. I will change this later to replace with a checkbox. 2011-08-31 18:47:29 +00:00
Laurent Destailleur
ab70e202d9 For the "default" field, we keep usa of standard on and off button because it is not a feature we activate or not but a choice of one line among others. I will change this later to replace with a checkbox. 2011-08-31 18:12:44 +00:00
Laurent Destailleur
5e30e4cd30 For the "default" field, we keep usa of standard on and off button because it is not a feature we activate or not but a choice of one line among others. I will change this later to replace with a checkbox. 2011-08-31 18:47:29 +00:00
Laurent Destailleur
8d41bd43ae For the "default" field, we keep usa of standard on and off button because it is not a feature we activate or not but a choice of one line among others. I will change this later to replace with a checkbox. 2011-08-31 18:12:44 +00:00
Laurent Destailleur
562cd49843 For the "default" field, we keep usa of standard on and off button because it is not a feature we activate or not but a choice of one line among others. I will change this later to replace with a checkbox. 2011-08-31 18:47:29 +00:00
Laurent Destailleur
36633d0053 For the "default" field, we keep usa of standard on and off button because it is not a feature we activate or not but a choice of one line among others. I will change this later to replace with a checkbox. 2011-08-31 18:12:44 +00:00
Laurent Destailleur
f95878998a For the "default" field, we keep usa of standard on and off button because it is not a feature we activate or not but a choice of one line among others. I will change this later to replace with a checkbox. 2011-08-31 18:47:29 +00:00
Laurent Destailleur
a765cc57f6 For the "default" field, we keep usa of standard on and off button because it is not a feature we activate or not but a choice of one line among others. I will change this later to replace with a checkbox. 2011-08-31 18:12:44 +00:00
Laurent Destailleur
247fd29662 For the "default" field, we keep usa of standard on and off button because it is not a feature we activate or not but a choice of one line among others. I will change this later to replace with a checkbox. 2011-08-31 18:47:29 +00:00
Laurent Destailleur
b309df16a2 For the "default" field, we keep usa of standard on and off button because it is not a feature we activate or not but a choice of one line among others. I will change this later to replace with a checkbox. 2011-08-31 18:12:44 +00:00
Laurent Destailleur
1aaf65c257 PDF works with us letter format 2011-08-31 14:42:47 +00:00
Juanjo Menent
7b5469007c Uniformize code 2011-08-31 08:10:39 +00:00
Juanjo Menent
ad28fb4b3d Uniformize code 2011-08-31 07:08:04 +00:00
Regis Houssin
726d9581dd Fix: remove obsolete tags (in progress) 2011-08-27 14:24:16 +00:00