Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-16 06:21:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
51,549 Commits 36 Branches 190 Tags
129f5aad8ea186fab41cc7a7492a6c901b93a92c
Commit Graph

2486 Commits

Author SHA1 Message Date
Laurent Destailleur
6746e76564 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-14 12:24:06 +01:00
Maxime Kohlhaas
6abf682faa Multi-company compatibility with transverse mode for pdf models 2013-01-14 12:01:44 +01:00
Laurent Destailleur
07ba988cf8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-01-14 11:45:16 +01:00
Laurent Destailleur
297c10d16b Qual: externalise code of merging PDFs into a library. 2013-01-14 11:39:30 +01:00
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-01-13 19:33:54 +01:00
Laurent Destailleur
9d886eca53 Fix: Scan of correct dir when them dir is forced 2013-01-10 11:19:46 +01:00
Regis Houssin
9812c91aff Fix: wrong EOL !!!!!!! 2013-01-10 08:27:12 +01:00
Regis Houssin
9a305c9066 New: add date format with second 2013-01-10 06:13:02 +01:00
Laurent Destailleur
abccfdd168 Fix: Option SERVICE_ARE_ECOMMERCE_200238EC 2013-01-09 19:56:43 +01:00
Regis Houssin
dd08da6ea8 Merge pull request #583 from FHenry/develop 
[ task #664 ] Add extrafields behaviours to Member Type
 2013-01-08 10:58:46 -08:00
fhenry
23b2aa6a7b [ task #664 ] Add extrafields behaviours to Member Type 2013-01-08 19:16:39 +01:00
Laurent Destailleur
9b6289503c Fix: Overwriting of login template works with module_parts. 2013-01-08 18:30:49 +01:00
Laurent Destailleur
9d47b812b9 New: Support module_parts['theme'] 2013-01-08 15:21:56 +01:00
Laurent Destailleur
ec3421d59e New: Add option MAIN_FORCETHEME (differs from MAIN_FORCETHEMEDIR) 2013-01-08 13:45:52 +01:00
Laurent Destailleur
142f171e50 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/.gitignore
 2013-01-08 11:10:47 +01:00
Laurent Destailleur
77f177d846 Fix: Bad selection of option 2013-01-08 11:04:29 +01:00
Laurent Destailleur
6d036699bb Qual: Uniformize usage of array module_parts. 2013-01-07 13:28:14 +01:00
Laurent Destailleur
091e469050 Fix: [ bug #622 ] attaching wrong file when sending the invoice via 
e-mail
 2013-01-07 00:40:18 +01:00
Marcos García
ad5d2c3459 Added missing translations, improved es_ES translations and translated untranslated text in modules admin page 2013-01-05 19:23:16 +01:00
Laurent Destailleur
96416735df Fix: [ bug #618 ] External accounts can access confidential informations 
(a lot)
 2013-01-02 18:43:59 +01:00
Laurent Destailleur
380d036d5c Fix: Bad test onto project list id 2013-01-02 15:12:46 +01:00
Laurent Destailleur
dbdc4e6ce8 Fix: Normalize option names 2012-12-31 13:40:13 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
35a9fbda59 Merge pull request #556 from marcosgdf/3.3 
Improved translations
 2012-12-29 07:29:29 -08:00
Laurent Destailleur
ca6e9643ea Fix: Pb in json function for objects 2012-12-29 12:21:13 +01:00
Laurent Destailleur
7d60c33c1a Fix: typo 2012-12-29 12:16:45 +01:00
Laurent Destailleur
17a3204578 Fix: dol_json_encode was wrong with objects 2012-12-29 06:51:12 +01:00
Marcos García
bae8a749b8 Replaced 'Tel' string with 'Phone' to allow translation 2012-12-29 02:51:35 +01:00
Laurent Destailleur
f566cd4d99 Fix: Use date of user to define if an action is in past or future. 2012-12-27 15:43:52 +01:00
Laurent Destailleur
251f4f3742 Fix: Avoid duplicate link 2012-12-27 15:33:18 +01:00
Laurent Destailleur
e39ec132e5 Fix: Checkstyle 2012-12-19 20:59:08 +01:00
Laurent Destailleur
78a1354a52 Fix: Solve phpunit regression. 
Include an option to support local tax of type 7 (need more time to
validate this type).
 2012-12-19 18:51:49 +01:00
Laurent Destailleur
e9d7a4adc6 Fix: Removed warnings 2012-12-19 15:29:27 +01:00
Laurent Destailleur
11ab579639 Fix: Several fixes to avoid PDF lib conflicts. 2012-12-19 13:06:45 +01:00
Laurent Destailleur
4cc44292e7 Fix: Maxi debug of holiday module 2012-12-18 13:12:11 +01:00
Regis Houssin
65090c582d Fix: checkstyle 2012-12-15 11:39:47 +01:00
Laurent Destailleur
c36d013971 Fix: Link missing 2012-12-14 17:55:42 +01:00
Regis Houssin
b09a44701e Fix: wrong EOL 2012-12-13 13:08:03 +01:00
Laurent Destailleur
a11e4b5124 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-12 19:02:38 +01:00
Laurent Destailleur
c107697dc1 Fix: Var not always initialized 2012-12-12 18:14:21 +01:00
Laurent Destailleur
e2e86e16d0 Merge pull request #537 from grandoc/develop 
Develop
 2012-12-12 07:01:54 -08:00
Laurent Destailleur
bdb112c820 Fix: Using bad root url. 2012-12-12 14:46:13 +01:00
Grand Philippe
a91a96e72e merge 2012-12-10 10:02:13 +01:00
Laurent Destailleur
6a60b78b28 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-12-08 14:25:36 +01:00
Laurent Destailleur
db91526643 Fix: Solve conflict into migration/backup/restore (child tables 
must be after parent tables).
Fix: Migration of old version
 2012-12-08 14:16:39 +01:00
fhenry
99f01f1dca [Task 632] : Add standard extra field feature for Agenda 2012-12-08 12:49:20 +01:00
Regis Houssin
be7d545297 Fix: wrong variable name 2012-12-07 10:50:16 +01:00
Regis Houssin
7ff3002993 Fix: Check if amount is numeric, for example, an error occured when 
amount value = o (letter) instead 0 (number)
 2012-12-07 10:47:36 +01:00
Laurent Destailleur
4a5062283d Merge pull request #515 from atm-maxime/develop 
New : option to reset numbering to 0 every month using @99 in the mask
 2012-12-05 04:19:16 -08:00
Maxime Kohlhaas
5992ebcdbc New : option to reset numbering to 0 every month using @99 in the mask 2013-02-06 11:52:49 +01:00