lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
54,675 Commits 43 Branches 150 Tags 886 MiB
260e296f20
Commit Graph

47241 Commits

Author SHA1 Message Date
BENKE Charlie
260e296f20 add $result on db->free 2016-07-18 02:05:30 +02:00
Laurent Destailleur
e2a03d18dd Merge remote-tracking branch 'origin/4.0' into develop 2016-07-16 19:58:36 +02:00
Sof
4d86291527 Fix : syntax error 2016-07-16 19:57:41 +02:00
Laurent Destailleur
d0380adc39 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/includes/jquery/plugins/datatables/media/js/jquery.js
	htdocs/product/list.php
 2016-07-16 19:54:57 +02:00
Laurent Destailleur
87c31d0761 Prepare 3.9.3 2016-07-16 19:38:58 +02:00
Laurent Destailleur
931531232c FIX duplicate jquery.js files 2016-07-16 19:38:18 +02:00
Juanjo Menent
70d1c7d1d9 Merge pull request #5487 from mrsof/patch-3 
FIX : bad name of field
 2016-07-16 19:29:48 +02:00
Laurent Destailleur
e299bad2b5 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-07-16 19:20:15 +02:00
Laurent Destailleur
6f489c1fbd FIX Missing original .js file (license violation if sources are not 
provided)
 2016-07-16 19:19:52 +02:00
Juanjo Menent
5aa63ffe73 Merge pull request #5490 from simnandez/4.0 
FIX #5479 using uninitialized variable $socid and other stuffs
 2016-07-16 19:15:39 +02:00
Sof
4a0668f7ae Fix : syntax error 2016-07-16 18:33:29 +02:00
Laurent Destailleur
970c4bea75 Fix minor css 2016-07-16 15:34:09 +02:00
Laurent Destailleur
553981426e Several minor fixes in expense reports 2016-07-16 15:21:38 +02:00
Laurent Destailleur
4b854fb33d Fix better error message when possible refering objects list is empty. 2016-07-16 14:37:35 +02:00
Laurent Destailleur
68227d91d9 FIX after enabling module expense report, the document template is not 
active by default.
 2016-07-16 14:14:28 +02:00
Juanjo Menent
a037e2f2d6 FIX #5479 using uninitialized variable $socid and other stuffs 2016-07-15 23:14:15 +02:00
Laurent Destailleur
28d86bc5a0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-15 19:57:46 +02:00
Laurent Destailleur
97b03e225b NEW Add option "Stock can be negative". Off by default. 2016-07-15 19:57:35 +02:00
Juanjo Menent
2ed446d014 FIX Option strict mode compatibility 2016-07-15 19:35:01 +02:00
Laurent Destailleur
1195e3bf0c FIX Direction of movement lost if an error occurs 2016-07-15 19:35:00 +02:00
Juanjo Menent
d932bb9532 Merge pull request #5488 from simnandez/develop 
NEW Do not use Functions Aliases
 2016-07-15 18:44:22 +02:00
Laurent Destailleur
7263b29cb4 Merge pull request #5301 from atm-ph/fix_develop_issue_2858 
NEW issue 2858 - Option to allow negative transfer
 2016-07-15 18:15:20 +02:00
Juanjo Menent
62c1302a27 NEW Do not use Functions Aliases 2016-07-15 17:58:14 +02:00
Laurent Destailleur
6fcd9e8dbf Merge pull request #4612 from bafbes/abb-1 
FIX Target object does not need to have all extrafields of source object.
 2016-07-15 17:41:29 +02:00
Juanjo Menent
e5372e5636 NEW Do not use Functions Aliases 2016-07-15 17:31:44 +02:00
Laurent Destailleur
6a30be1e67 NEW Notification module can also manage notification per user. 2016-07-15 17:25:09 +02:00
Laurent Destailleur
8c53921b5f CRLF 2016-07-15 17:22:27 +02:00
Laurent Destailleur
e0e96cef60 Merge remote-tracking branch 'origin/4.0' into develop 2016-07-15 17:13:44 +02:00
Laurent Destailleur
9ba1ca5acb Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14 
Conflicts:
	htdocs/langs/en_US/companies.lang
 2016-07-15 17:05:12 +02:00
Sof
35fb83e68f FIX : bad name of field 2016-07-15 16:53:53 +02:00
Laurent Destailleur
0c5851d566 Fix CRLF 2016-07-15 14:49:48 +02:00
Laurent Destailleur
f0c80bf78b Merge pull request #5388 from atm-florian/dev_new_ship_tag_mail 
NEW : Add __SHIPPINGTRACKNUM__, __SHIPPINGTRACKNUMURL__ into shipping
 2016-07-15 14:31:17 +02:00
Laurent Destailleur
1b070babc8 Merge remote-tracking branch 'origin/4.0' into develop 2016-07-15 14:23:44 +02:00
Laurent Destailleur
0f4f4ea61c FIX #5482 #5485 2016-07-15 14:22:49 +02:00
Laurent Destailleur
fdfe4d9ac5 Fix missing getFormMail as "addreplace" hook 2016-07-15 14:21:07 +02:00
Laurent Destailleur
c96a3bfc13 Fix when going back on an export page after session has expired to avoid 
a technical error.
 2016-07-15 14:14:55 +02:00
Laurent Destailleur
9512bf1ac7 Add phpunit tests for option USE_STRICT_CSV_RULES 2016-07-15 12:30:24 +02:00
Bahfir Abbes
5966170a0d Done, thanks 2016-07-15 10:43:01 +01:00
Laurent Destailleur
f7f812e11c Merge pull request #5269 from defrance/patch-5 
NEW Add option to generate strict CSV. Currently if \n or \r we replaced chars, now we can addquote too
 2016-07-15 11:27:02 +02:00
Laurent Destailleur
00d80d827f To match new standard, next version will be called 5.0, 6.0, ... 2016-07-15 11:17:33 +02:00
Laurent Destailleur
f758f3466e Merge pull request #5260 from atm-gauthier/develop_add_selectbank_on_thirdparty_card 
NEW : select default bank account on thirdparty card
 2016-07-15 11:16:17 +02:00
Laurent Destailleur
74f28b3861 NEW Complete table llx_ecm_files with field generated_or_uploaded 2016-07-15 10:38:13 +02:00
Laurent Destailleur
409d6df067 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-15 10:27:34 +02:00
Laurent Destailleur
eb47ec5823 Drop another deprecated table llx_ecm_documents (replace by 
llx_ecm_files)
 2016-07-15 10:27:20 +02:00
Laurent Destailleur
7e9dbb4d2a Fix bad encoding of param 2016-07-15 10:23:53 +02:00
Laurent Destailleur
09306ba974 Drop not used table llx_document_generator (list of generators must be 
managed by submodules like are the templates of document or engines to
select emailing targets (scan of a dedicated dir)
 2016-07-15 10:23:36 +02:00
Laurent Destailleur
ca5c912432 Merge pull request #5370 from IonAgorria/fix-fetchline 
NEW: Add getElementProperties entry for proposal line
 2016-07-15 10:02:20 +02:00
Laurent Destailleur
52d9bbb92b Merge pull request #5345 from atm-alexis/NEW_add_element_in_referent_list 
NEW hook in element overview for a project
 2016-07-14 23:18:01 +02:00
Laurent Destailleur
da4d28ae3f Merge pull request #5359 from GPCsolutions/autoset_install 
New: Autoset port and admin user from db type
 2016-07-14 23:16:48 +02:00
Laurent Destailleur
36641533cb Merge pull request #5437 from Oeris/oeris-bookkeeping 
NEW|Display bookkeeping by accounting account
 2016-07-14 23:10:03 +02:00