lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,692 Commits 43 Branches 150 Tags 886 MiB
a514b97837
Commit Graph

14575 Commits

Author SHA1 Message Date
Laurent Destailleur
d14bd829fb FIX trans on null object 2018-08-30 17:01:22 +02:00
Laurent Destailleur
3e0b2d0281 Fix phpcs 2018-08-29 21:51:49 +02:00
Laurent Destailleur
c071e751f7
Merge pull request #9329 from ptibogxiv/patch-44 
FIX deletion of stripe customer
 2018-08-29 21:12:53 +02:00
Laurent Destailleur
489e766cbf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/ticket/class/ticket.class.php
 2018-08-29 20:24:01 +02:00
Laurent Destailleur
3ebfb23407 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/fournisseurs.php
	htdocs/ticket/class/ticket.class.php
 2018-08-29 20:22:50 +02:00
Laurent Destailleur
86d8513138
Merge pull request #9309 from frederic34/trimtrailing2 
last trimtrailing
 2018-08-29 17:57:05 +02:00
Laurent Destailleur
7bf48b8d77 Fix date_start and date_end not saved on supplier invoice 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2018-08-29 17:26:41 +02:00
ptibogxiv
4de8b8bfd9
fix deletion of stripe customer 2018-08-29 17:25:37 +02:00
Laurent Destailleur
98356c6ed0 Fix date_start and date_end not saved on supplier invoice 2018-08-29 17:03:18 +02:00
Frédéric FRANCE
0e512cbc36
Merge remote-tracking branch 'upstream/develop' into trimtrailing2 2018-08-29 15:47:55 +02:00
Laurent Destailleur
ee204e2e64 Fix regression in php style 2018-08-29 15:37:35 +02:00
Laurent Destailleur
74b3e3e814 Fix for compatibility with lines with no prices (some external modules) 2018-08-29 14:50:12 +02:00
Frédéric FRANCE
7b2bfb28c2
Merge remote-tracking branch 'upstream/develop' into trimtrailing2 2018-08-29 12:48:12 +02:00
Laurent Destailleur
0eb4f8bb96 NEW Can set the datestart and dateend of cron job into module descriptor 2018-08-29 11:47:20 +02:00
Laurent Destailleur
fde9c94b1c Fix regression in media editor in websites 2018-08-28 14:21:58 +02:00
Frédéric FRANCE
1182f29864
trimtrailing 2018-08-28 08:33:02 +02:00
Laurent Destailleur
9c6ce4b29d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-28 02:36:15 +02:00
Laurent Destailleur
2db84a679e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
 2018-08-28 02:35:45 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing 
Trimtrailing
 2018-08-28 02:30:02 +02:00
Laurent Destailleur
0a7ce338f9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2018-08-28 02:23:34 +02:00
Laurent Destailleur
1842a4bb41
Merge pull request #9278 from grandoc/new_branch_21_08_2018 
Update and standardize code
 2018-08-28 02:13:28 +02:00
Laurent Destailleur
6f427cbed3
Merge pull request #9293 from frederic34/patch-25 
NEW Add __DAY_TEXT__ and __MONTH_TEXT__ substitutions vars
 2018-08-28 01:42:35 +02:00
Laurent Destailleur
5185d32cc9
Merge pull request #9286 from frederic34/patch-22 
Update propal.lib.php
 2018-08-28 01:40:58 +02:00
Frédéric FRANCE
faa29f9ae0 Update antivir.class.php 2018-08-28 01:34:42 +02:00
Laurent Destailleur
004b352e8e
Merge pull request #9279 from frederic34/patch-11 
FIX Error message when sending a file with .virus extension
 2018-08-28 01:26:04 +02:00
Laurent Destailleur
0300991389 Fix trans 2018-08-27 23:42:47 +02:00
Laurent Destailleur
90c3f8afce Fix trans 2018-08-27 23:39:11 +02:00
Laurent Destailleur
d2154e72c0 Fix trans 2018-08-27 23:23:49 +02:00
Laurent Destailleur
e67e32c023 Add forcecombo on select language 2018-08-24 15:25:18 +02:00
Laurent Destailleur
b22d9db1a5 Fix tdclass 2018-08-24 15:18:19 +02:00
Laurent Destailleur
4885e61240 Fix tdclass 2018-08-24 15:16:03 +02:00
Laurent Destailleur
9f92974e98 Fix tdclass 2018-08-24 15:13:34 +02:00
Laurent Destailleur
32bde2c375 Add tdclass to form confirm for more control 2018-08-24 15:12:47 +02:00
Laurent Destailleur
d2a7c9976b Fix syntax error 2018-08-24 15:05:57 +02:00
Laurent Destailleur
07407f46a7 Remove colspan 2018-08-24 15:02:19 +02:00
Laurent Destailleur
7a35b560a6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-23 19:51:52 +02:00
Laurent Destailleur
499d93b8c4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/projet/class/task.class.php
	htdocs/projet/tasks/task.php
 2018-08-23 19:50:58 +02:00
Philippe GRAND
215677c972 Standardize and update code 2018-08-23 18:17:09 +02:00
Frédéric FRANCE
6abd5d478a
Update functions.lib.php 2018-08-23 17:15:14 +02:00
Philippe GRAND
74ce0bfea6 Standardize and update code 2018-08-23 16:54:24 +02:00
Philippe GRAND
80b7229174 Standardize and update code 2018-08-23 11:34:55 +02:00
Philippe GRAND
9e900e583d Merge branch 'new_branch_21_08_2018' of github.com:grandoc/dolibarr into new_branch_21_08_2018 2018-08-23 11:13:54 +02:00
Philippe GRAND
aafa16afa5 Update and standardize code 2018-08-23 11:11:46 +02:00
Philippe Grand
e09f7bedd0
Update commonobject.class.php 2018-08-23 09:57:19 +02:00
Frédéric FRANCE
692352e0e4
Update propal.lib.php 2018-08-22 22:55:12 +02:00
Philippe GRAND
504b0e3d16 Update and standardize code 2018-08-22 18:34:50 +02:00
Frédéric FRANCE
96f16b7497
Update commondocgenerator.class.php 2018-08-22 17:29:05 +02:00
Laurent Destailleur
b650f7ac17 Fix tab 2018-08-22 13:37:18 +02:00
Laurent Destailleur
c7a241a5db FIX Get templates in a forced language 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2018-08-22 13:22:49 +02:00
Laurent Destailleur
c20d556265 FIX Get templates in a forced language 2018-08-22 13:16:55 +02:00