Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
75,225 Commits 36 Branches 190 Tags
cfa414b2de51c08ad9c110bf7a0a3d7b51d3a093
Commit Graph

500 Commits

Author SHA1 Message Date
Laurent Destailleur
68f6ebd0ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/security.lib.php
	htdocs/modulebuilder/template/myobject_card.php
 2018-10-30 14:47:39 +01:00
Laurent Destailleur
b4c9df65f9 FIX #9907 Can set several modules on ->depends 2018-10-30 13:56:51 +01:00
Laurent Destailleur
8fbf5b1f33 FIX deletion on draft is allowed if we are allwoed to create 2018-10-29 18:28:19 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
0e464ea4f5 Merge pull request #9866 from frederic34/emptylines 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
 2018-10-26 15:31:24 +02:00
Laurent Destailleur
cae83cd8e7 Add solution to translate 2018-10-26 11:10:04 +02:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
762d82f2fe Move declaration into common 2018-10-19 13:38:05 +02:00
Laurent Destailleur
97429aeb7a Merge pull request #9721 from grandoc/new_branch_10_10_2018 
Standardize and update code
 2018-10-16 19:30:19 +02:00
Laurent Destailleur
f5029bf52b Fix template 2018-10-16 17:46:14 +02:00
Philippe GRAND
9e494e65e0 Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-12 19:04:02 +02:00
Philippe GRAND
849a1a9400 Standardize and update code 2018-10-12 09:26:58 +02:00
Abbes Bahfir
8160dcec6a Fix: Undeclared global variable 2018-10-09 16:10:49 +01:00
Philippe GRAND
5583211246 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-06 12:00:24 +02:00
Laurent Destailleur
e24117e75b Fix position of modules is string on 2 digits 2018-10-06 11:57:53 +02:00
Philippe GRAND
073ec85208 Standardize code 2018-10-05 15:51:08 +02:00
Laurent Destailleur
0fd7a5a172 Merge pull request #9659 from frederic34/patch-15 
typo in template
 2018-10-04 17:22:47 +02:00
Laurent Destailleur
dec313810d Update myobject_list.php 2018-10-04 17:09:19 +02:00
Frédéric FRANCE
a7b2b00230 typo in template 2018-10-02 15:56:12 +02:00
Abbes Bahfir
0cb5b52318 Fix : backtopage link in listings 2018-10-01 11:10:46 +01:00
Laurent Destailleur
873f43db94 Uniformize interface for tickets 2018-10-01 03:19:21 +02:00
Philippe GRAND
574cfad48f Standardize and update code 2018-09-28 14:49:34 +02:00
Laurent Destailleur
ec2dd7ba4e Remove not used code 2018-09-28 13:13:04 +02:00
Laurent Destailleur
e9dd967610 Support nomassaction param on list 2018-09-28 13:12:47 +02:00
Laurent Destailleur
a4cd96e03c Clean code when there is no setup to do 2018-09-24 10:08:57 +02:00
Philippe GRAND
7c92157636 Standardize and update code 2018-09-20 14:25:53 +02:00
Laurent Destailleur
7fb2b1a769 Fix reset extrafields that must be unique when cloning 2018-09-16 22:30:13 +02:00
Laurent Destailleur
ab0f842db6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 12:55:44 +02:00
Laurent Destailleur
a0bcf999c5 FIX #9043 2018-09-16 09:45:33 +02:00
Laurent Destailleur
a6d4185d6b FIX #9043 2018-09-16 09:44:52 +02:00
Frédéric FRANCE
998b67fa98 Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 18:32:15 +02:00
Frédéric FRANCE
2dd01011f8 Update myobject.class.php 2018-09-09 14:25:35 +02:00
Frédéric FRANCE
7e0b1055db Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-09 13:36:53 +02:00
Laurent Destailleur
f29720cc98 Fix scrutinizer bug 2018-09-08 18:40:36 +02:00
Frédéric FRANCE
65b74ad30f Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Philippe GRAND
0492492df1 fix merge 2018-09-04 12:30:06 +02:00
Frédéric FRANCE
7288335c6d Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-03 19:01:11 +02:00
Regis Houssin
2b7e15edbd FIX remove old triggers 2018-09-03 09:35:14 +02:00
Philippe GRAND
7a0c19485e fix merge 2018-09-03 09:34:08 +02:00
Frédéric FRANCE
35232b753a move phpcs:ignore 2018-09-02 20:37:12 +02:00
Frédéric FRANCE
03a5aba8a2 move phpcs:ignore 2018-09-02 18:49:23 +02:00
Frédéric FRANCE
0c16761f48 Update myobject.class.php 2018-09-02 10:23:00 +02:00
Philippe GRAND
7b0d3c32ab Standardize and Update code 2018-09-01 22:55:10 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Laurent Destailleur
c8912d6a4f Merge pull request #9242 from frederic34/camelCaps 
mark non camelCaps function
 2018-09-01 15:37:56 +02:00
Philippe GRAND
c013f9cf3d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 15:13:04 +02:00
Laurent Destailleur
c2548b8b39 Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm 
NEW hook formConfirm always called if hooked
 2018-09-01 14:50:08 +02:00
Philippe GRAND
17e349eba2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 14:27:53 +02:00
Laurent Destailleur
bcee0ef0ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/societe/class/societe.class.php
	htdocs/stripe/config.php
 2018-09-01 14:16:57 +02:00
Frédéric FRANCE
57fb3dc2f4 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00