Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
71,955 Commits 36 Branches 189 Tags
8b718d0cb1ea04aecf4723625f1750d940f5c38a
Commit Graph

495 Commits

Author SHA1 Message Date
Laurent Destailleur
2011afe6fb Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
5ec9a1ca7f Remove deprecated parameter 2018-12-11 10:15:13 +01:00
Laurent Destailleur
bb565d33f9 FIX Several fixes in fetchAll 2018-11-27 16:39:08 +01:00
Laurent Destailleur
61fddadc3f Complete the fetchAll of modulebuilder + websitepage 2018-11-20 18:29:29 +01:00
Laurent Destailleur
e020597ba7 Fix deletion for class build with modulebuilder 2018-11-19 21:11:26 +01:00
Frédéric FRANCE
731d19a29b add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Laurent Destailleur
84983140b6 Merge pull request #9896 from hregis/develop_email 
FIX change my deprecated email
 2018-11-11 17:35:35 +01:00
Laurent Destailleur
35419fa206 Dolibarize code 2018-11-11 15:06:08 +01:00
Laurent Destailleur
bae1ff67a4 Merge pull request #9986 from frederic34/patch-9 
remove warning
 2018-11-10 12:16:10 +01:00
Laurent Destailleur
e86e3ec7ac Work on email collector 2018-11-09 19:30:44 +01:00
Frédéric FRANCE
172468587d Update mymodulewidget1.php 2018-11-09 18:13:13 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Frédéric FRANCE
1fd398234f remove warning 2018-11-09 15:29:49 +01:00
Laurent Destailleur
c74ad61365 Fix look and feel v8 2018-11-08 10:04:25 +01:00
Laurent Destailleur
193b153fbf Work on email collector 2018-11-07 18:02:08 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Destailleur
9a0b5fb599 Fix extrafields 2018-11-07 12:25:22 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Laurent Destailleur
52d4426e87 Debug new modules 2018-11-05 16:38:07 +01:00
Laurent Destailleur
d65bf1fbc7 Fix emailcollector 2018-11-05 15:31:41 +01:00
Laurent Destailleur
01d7b1e96a Fix readme detection 2018-11-05 10:15:22 +01:00
Frédéric FRANCE
aa8236dd98 fix phpcs 2018-10-31 21:33:37 +01:00
Laurent Destailleur
970f501147 Debug modulebuilder 2018-10-31 20:10:20 +01:00
Laurent Destailleur
e4cfc2c6cb Fix public 2018-10-31 17:30:08 +01:00
Laurent Destailleur
0ca5da055f Debug v9 2018-10-31 15:04:01 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
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
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
 2018-10-16 18:47:11 +02:00
Laurent Destailleur
502c52b78f Show real path of module if not into custom 2018-10-16 18:09:43 +02:00
Laurent Destailleur
f5029bf52b Fix template 2018-10-16 17:46:14 +02:00
Laurent Destailleur
e19453450d Fix closing tag 2018-10-13 19:57:34 +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