Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 10:08:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,293 Commits 36 Branches 190 Tags
cad2fedf70a54dee93551a6be7807a2a3f9f2018
Commit Graph

5187 Commits

Author SHA1 Message Date
Laurent Destailleur
c573df4f0e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/card.php
 2017-08-26 22:33:56 +02:00
Laurent Destailleur
782b85ba13 Merge pull request #7285 from hregis/6.0_bug 
Fix: avoid error "A non-numeric value encountered"
 2017-08-26 19:31:16 +02:00
Laurent Destailleur
7329d21dcd Fix lang selection 2017-08-25 17:13:33 +02:00
Laurent Destailleur
9d380a8b8a NEW Can edit the language into the email templates editor. 2017-08-25 16:38:45 +02:00
Laurent Destailleur
4337001418 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/list.php
 2017-08-24 14:26:45 +02:00
Laurent Destailleur
8e6546497a Code comment 2017-08-24 13:43:36 +02:00
Laurent Destailleur
326d3df63f FIX select of category 
FIX pb with extrafield list and key '0'

Conflicts:
	htdocs/core/class/extrafields.class.php
 2017-08-24 13:28:56 +02:00
Laurent Destailleur
7da6f93d7e FIX select of category 
FIX pb with extrafield list and key '0'
 2017-08-24 13:23:15 +02:00
Laurent Destailleur
17f44ad980 NEW Can make a specific setup for SMTP sending for emailing module 2017-08-24 02:02:00 +02:00
Regis Houssin
1befd9c67f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-08-23 21:05:36 +02:00
Regis Houssin
7da1b215f3 Fix: avoid error "A non-numeric value encountered" 2017-08-23 21:01:14 +02:00
Laurent Destailleur
ab37794f61 Fix text 2017-08-23 19:34:26 +02:00
Laurent Destailleur
90afbcb034 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/bank.php
	htdocs/core/lib/functions.lib.php
 2017-08-23 17:02:53 +02:00
Laurent Destailleur
f3ef6448d7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/admin/supplier_payment.php
	htdocs/core/lib/ajax.lib.php
	htdocs/don/admin/donation.php
	htdocs/product/admin/product.php
 2017-08-23 16:11:51 +02:00
Laurent Destailleur
4da49dfc2d FIX #7239 2017-08-23 15:02:38 +02:00
Regis Houssin
2f537a1ade Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/charges/index.php
	htdocs/compta/paiement/list.php
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-08-22 18:49:40 +02:00
Laurent Destailleur
e05ac34966 Fix remove var_dump 2017-08-22 18:03:37 +02:00
Laurent Destailleur
64c4f899f3 Fix charset management with ace 2017-08-22 18:00:54 +02:00
Laurent Destailleur
db9cc4683a Fix php warning 2017-08-22 15:29:40 +02:00
Laurent Destailleur
14cd150762 NEW Introduce experimental feature to search dolistore from application 2017-08-22 14:47:01 +02:00
Laurent Destailleur
30c39d246b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-22 11:18:56 +02:00
Laurent Destailleur
731f826a55 NEW jquery date selector become default date selector 2017-08-22 09:23:35 +02:00
Laurent Destailleur
2321091170 NEW Move the upload input on top right in ECM module 2017-08-20 21:23:19 +02:00
Laurent Destailleur
188653a85d Work on website module 2017-08-20 18:50:51 +02:00
Laurent Destailleur
260beed512 NEW Generated files are now indexed in database 2017-08-18 23:19:55 +02:00
Laurent Destailleur
097b660c41 Mutualize code 2017-08-18 16:25:00 +02:00
florian HENRY
874d61bb6d Other fix 2017-08-18 11:35:20 +02:00
florian HENRY
c793e847bc fix comondoc generator 2017-08-18 11:30:13 +02:00
florian HENRY
f6a1e7685c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_manageextrafieldswithmultientity 2017-08-04 17:13:53 +02:00
florian HENRY
03e935f493 Better management 2017-08-04 17:11:40 +02:00
Laurent Destailleur
1bd992dae9 Merge pull request #7238 from atm-florian/dev_manageextrafieldswithmultientity 
NEW : manageme extrafields with multientity
 2017-08-04 15:39:31 +02:00
Laurent Destailleur
402e6bf650 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/various_payment/card.php
	htdocs/compta/bank/various_payment/index.php
	htdocs/compta/paiement/list.php
	htdocs/core/modules/modCron.class.php
 2017-08-04 15:39:00 +02:00
Laurent Destailleur
da831d2c8e FIX Bad link in ECM 2017-08-04 13:45:57 +02:00
Laurent Destailleur
5b7c144f95 FIX Bad link in ECM 2017-08-04 13:45:20 +02:00
Laurent Destailleur
c107a77722 NEW Can filter on document name in ECM module for automatic tree 2017-08-04 13:10:51 +02:00
Laurent Destailleur
3a098ca047 Reduce verbosity 2017-08-04 11:50:30 +02:00
florian HENRY
8fd45383e2 NEW : manageme extrafields with multientity 2017-08-04 09:00:11 +02:00
Laurent Destailleur
f058fa1938 Better detection if a module provide triggers 2017-08-03 12:19:31 +02:00
Laurent Destailleur
81b11100b0 Prepare code to clone site an fetch external page 2017-08-03 01:45:31 +02:00
Laurent Destailleur
fa752348c8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/various_payment/index.php
	htdocs/contact/list.php
	htdocs/langs/en_US/errors.lang
 2017-08-02 17:56:09 +02:00
Laurent Destailleur
5b1f5b0f20 Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
Laurent Destailleur
71d49f1c6f Fix pb in ecm 2017-08-01 18:44:34 +02:00
Laurent Destailleur
ba221650cf Start to work on using the jquery date selector. 2017-08-01 01:25:30 +02:00
Regis Houssin
0dc0fe81fc Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-31 07:40:01 +02:00
atm-ph
1f3f9e40b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report 2017-07-27 16:01:53 +02:00
Laurent Destailleur
ec27eb5b1e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/societe/list.php
 2017-07-27 02:09:40 +02:00
Laurent Destailleur
bdfb0b7561 FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes 2017-07-26 21:22:53 +02:00
Regis Houssin
acd5780e32 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-07-26 08:58:56 +02:00
Laurent Destailleur
760d2617a0 Can disable the search of previous/next in dol_banner 2017-07-25 23:03:28 +02:00
Laurent Destailleur
5b9ac2a7a9 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/index.php
 2017-07-25 21:11:36 +02:00