Commit Graph

40390 Commits

Author SHA1 Message Date
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
Laurent Destailleur
b0f705a7de Merge pull request #781 from jfefe/develop-eof
Remove DOS EOF (dos2unix utility used)
2013-03-27 06:54:11 -07: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
Laurent Destailleur
da8932f987 Some fix for cron module 2013-03-27 13:24:26 +01:00
Regis Houssin
ce8631619a Fix: avoid errors due to BROKEN FEATURES !!! 2013-03-27 11:55:14 +01:00
Regis Houssin
c36f52c47a Fix: avoid errors due to BROKEN FEATURES !!! 2013-03-27 11:54:10 +01:00
fhenry
6494764e76 Add copy files ODT project on install 2013-03-27 11:24:57 +01:00
fhenry
9507f4258b Add inforamtion on Project into ODT project 2013-03-26 23:32:22 +01:00
Laurent Destailleur
8c053b2f8d Debug module cron 2013-03-26 21:18:01 +01:00
Laurent Destailleur
0a4f96e93a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-03-26 20:58:05 +01:00
Laurent Destailleur
19ae4a75d6 Qual: More robust function to run jobs 2013-03-26 20:57:24 +01:00
Regis Houssin
e75c609a0a Fix: wrong var name 2013-03-26 18:33:44 +01:00
Regis Houssin
b5d13dc6e6 Fix: missing parameter 2013-03-26 18:33:23 +01:00
Regis Houssin
e9a8457d7e Fix: broken features due to the removal of the trigger FILE_UPLOAD ! 2013-03-26 18:33:14 +01:00
Regis Houssin
61826b04d8 Fix: broken feature for use hooks with dol_move_uploaded_file method 2013-03-26 18:33:06 +01:00
Regis Houssin
a701cbd77c Fix: wrong var name 2013-03-26 17:47:37 +01:00
Laurent Destailleur
b694451ab2 Use engine instead of type 2013-03-26 17:45:07 +01:00
Regis Houssin
4fe94b800b Fix: missing parameter 2013-03-26 17:43:48 +01:00
Laurent Destailleur
676f59fb6d Merge pull request #779 from defrance69/patch-20
Update mysql.class.php
2013-03-26 09:43:46 -07:00
Laurent Destailleur
6df1e95678 Merge pull request #778 from simnandez/develop
Fix: [ bug #777 ] Withdrawal receipt set Credited
2013-03-26 09:43:10 -07:00
Regis Houssin
dff74667c2 Fix: broken features due to the removal of the trigger FILE_UPLOAD ! 2013-03-26 17:29:40 +01:00
Regis Houssin
33a82c396e Fix: broken feature for use hooks with dol_move_uploaded_file method 2013-03-26 17:12:00 +01:00
BENKE Charles
2c56a1c8dc Update mysql.class.php
Create Table 'type' not supported on recent mysql databases, need to use 'engine' instead
2013-03-26 16:49:02 +01:00
simnandez
26d2e3d928 Fix: [ bug #777 ] Withdrawal receipt set Credited 2013-03-26 15:48:12 +01:00
frederic34
1cd39df82b Merge remote-tracking branch 'upstream/develop' into develop 2013-03-26 10:24:46 +01:00
frederic34
4c29eaecd1 Print IPP 2013-03-26 10:23:00 +01:00
Regis Houssin
2731b0af2b Merge pull request #777 from FHenry/develop
move doctemplate into install
2013-03-26 01:20:30 -07:00
fhenry
c97d712e50 move doctemplate into install 2013-03-26 09:17:24 +01:00
Regis Houssin
26f120cbc7 Fix: move doctemplates in install directory 2013-03-26 08:57:37 +01:00
Sébastien de Chateauvieux
28999af70b TVA NPR : set function get_default_npr 2013-03-26 08:47:17 +04:00
Sébastien de Chateauvieux
148ad65150 TVA NPR : deduplicate line. Remove tva npr from journal lines 2013-03-26 08:11:06 +04:00
Sébastien de Chateauvieux
bbbc4ad8c4 TVA NPR: add parameter in function call. Accept * tva 2013-03-26 07:57:19 +04:00
Laurent Destailleur
55a9d3abf1 Merge pull request #776 from FHenry/develop
[ task #770 ] Add ODT document generation for Projects module
2013-03-25 15:52:30 -07:00
Laurent Destailleur
10d7fad524 Merge pull request #775 from defrance69/patch-19
Update modAgenda.class.php
2013-03-25 15:49:54 -07:00
Laurent Destailleur
14b3f91f3f Merge pull request #774 from atm-maxime/develop
Fix : on a new trigger, using $this but not in a class...
2013-03-25 15:45:27 -07:00
fhenry
48e4ffb4b5 Change-Id: I1aca3849ce75a7aea527a3897e4fcd0e70ccb428 2013-03-25 19:32:30 +01:00
fhenry
b5751ab658 Add copyright 2013-03-25 19:31:17 +01:00