2
0
forked from Wavyzz/dolibarr
Commit Graph

1684 Commits

Author SHA1 Message Date
Laurent Destailleur
c31cf08431 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modCategorie.class.php
2020-12-04 21:55:57 +01:00
Laurent Destailleur
f90ba80488 Merge pull request #15510 from dolibit-ut/patch-44
Update autotranslator.php
2020-11-25 12:57:03 +01:00
UT from dolibit
1b6bc2a86d Update README 2020-11-24 18:46:37 +01:00
stickler-ci
c74e952f64 Fixing style errors. 2020-11-24 17:40:28 +00:00
UT from dolibit
c789b2d6e6 Update autotranslator.php
these sites are defunct:
- http://code.google.com/intl/fr/apis/language/translate/overview.html
- http://translate.google.com/translate_tools

this site    http://www.google.com/language_tools    is now   https://translate.google.com
2020-11-24 18:37:32 +01:00
Laurent Destailleur
74126e97f3 Add doc file 2020-11-22 00:32:41 +01:00
Laurent Destailleur
2da6fc1ef0 Remove warning 2020-11-07 12:06:14 +01:00
Laurent Destailleur
ea4ad24ac5 Fix doc 2020-11-07 02:14:17 +01:00
Frédéric FRANCE
545f39aacf add work 2020-11-05 19:00:45 +01:00
Frédéric FRANCE
5fa13533ee make choice required 2020-10-30 21:41:41 +01:00
Frédéric FRANCE
e0184f66d3 zapier on ticket create 2020-10-30 21:09:39 +01:00
Frédéric FRANCE
5afab4ba90 zapier on ticket create 2020-10-30 20:57:43 +01:00
Frédéric FRANCE
41e8f0085c zapier on ticket create 2020-10-30 20:37:23 +01:00
Frédéric FRANCE
c41459abe4 fields 2020-10-29 23:42:51 +01:00
Frédéric FRANCE
e049eb960d add trigger user create 2020-10-29 20:53:28 +01:00
Frédéric FRANCE
5d0ac98c34 work on zapier 2020-10-29 00:34:41 +01:00
Frédéric FRANCE
7a7a6f8018 fix phpcs 2020-10-27 21:28:26 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
2020-10-25 16:01:18 +01:00
Laurent Destailleur
859fea626d Use more generic domain 2020-10-25 15:22:23 +01:00
Frédéric FRANCE
8d08157018 add zapier readme 2020-10-25 09:26:48 +01:00
Frédéric FRANCE
ec033ff101 add zapier readme 2020-10-25 09:22:51 +01:00
Alexandre SPANGARO
ca7ad35342 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-09 06:39:42 +02:00
Regis Houssin
111f73bd86 FIX add default value of timestamp for avoid error 2020-10-08 12:29:01 +02:00
Aurélien
140200213e change table into DB and ref #14697 2020-10-06 11:04:31 +02:00
Laurent Destailleur
d3add1b718 Remove false postivie exakat error 2020-10-04 11:20:53 +02:00
Laurent Destailleur
380fe1acb7 Fix doc 2020-09-17 12:13:32 +02:00
Laurent Destailleur
8a10617c0c Update script 2020-09-17 12:12:49 +02:00
Laurent Destailleur
bdc30cc50b Update script 2020-09-17 12:10:54 +02:00
Laurent Destailleur
d41a813e0e Add script to reinit pass of the demo 2020-09-17 12:05:52 +02:00
Laurent Destailleur
b5376d3322 Upgrade lib for phpdebugbar 2020-09-07 21:18:26 +02:00
Laurent Destailleur
66f9f37f41 Minor code and doc enhancement 2020-08-20 19:00:43 +02:00
Laurent Destailleur
bd65e5612f Fix duplicate id 2020-08-17 20:06:01 +02:00
Laurent Destailleur
4c0785e996 FIX #14469 2020-08-16 23:13:27 +02:00
Alexandre SPANGARO
27c36713d3 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-08-16 22:10:02 +02:00
Laurent Destailleur
fb811a1656 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/system/database-tables.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/langs/fr_FR/withdrawals.lang
	htdocs/societe/class/societe.class.php
2020-08-03 14:44:01 +02:00
Laurent Destailleur
e64b8eaf40 Fix debug credit transfer module 2020-08-03 11:21:13 +02:00
Laurent Destailleur
2687666579 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-29 13:54:12 +02:00
Laurent Destailleur
8045cff888 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/expedition/class/expedition.class.php
2020-07-29 13:53:09 +02:00
Laurent Destailleur
6bd450dcd0 Doc 2020-07-29 13:10:31 +02:00
Laurent Destailleur
91a50038ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/fiche-stat.php
2020-07-27 19:35:34 +02:00
Laurent Destailleur
8c06e3577d Fix several trouble with diret debit module and credit transfer module 2020-07-27 19:33:24 +02:00
Laurent Destailleur
988e9e5817 Update to jquery 3.5.1 2020-07-27 13:52:19 +02:00
Alexandre SPANGARO
59ee22537d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-07-06 03:24:27 +02:00
Laurent Destailleur
6c6a64db66 Fix phpcs 2020-06-26 19:55:35 +02:00
Laurent Destailleur
9bbe004e96 Add test tool 2020-06-26 01:14:39 +02:00
Laurent Destailleur
fd6af312e9 Fix tool 2020-06-18 03:49:35 +02:00
Laurent Destailleur
b763b40d8c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-12 19:37:27 +02:00
Laurent Destailleur
2c327aae66 Prepare v12 2020-06-12 19:30:23 +02:00
Laurent Destailleur
8492272a08 Fix initdemo 2020-06-12 19:11:00 +02:00
Laurent Destailleur
a995bf97eb Fix tools 2020-06-06 15:35:50 +02:00