lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
87,108 Commits 43 Branches 150 Tags 886 MiB
81fbb80823
Commit Graph

813 Commits

Author SHA1 Message Date
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-12 08:46:08 +00:00
Laurent Destailleur
8c1bba5a60 Fix cancel link 2019-11-11 21:11:12 +01:00
Laurent Destailleur
19213b0d3d Fix modulebuilder 2019-11-11 21:02:32 +01:00
Laurent Destailleur
96314c9c26 Debug BOM 2019-11-09 20:12:27 +01:00
Laurent Destailleur
b1394463db Debug mrp 2019-11-09 20:02:46 +01:00
Laurent Destailleur
5b6ace387e Debug BOM and MO module 2019-11-09 19:47:49 +01:00
Laurent Destailleur
917c8df225 Add type of db driver in stats 2019-11-09 12:24:18 +01:00
Scrutinizer Auto-Fixer
812d0af1d9 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-08 14:51:54 +00:00
Laurent Destailleur
89105fdd36 Fix code according to modulebuilder 2019-11-07 11:40:35 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
d972fa8bcb Fix pb with model_pdf 2019-11-05 20:20:57 +01:00
Laurent Destailleur
7c4942b7be Fix debug BOM/MO 2019-11-05 20:14:33 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Laurent Destailleur
ec8bd6327d Fix css 2019-11-04 18:53:46 +01:00
Laurent Destailleur
4ca85eacc1 Debug module BOM 2019-11-04 15:45:50 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Laurent Destailleur
e67a1a8118 Debug 2019-11-04 14:20:42 +01:00
Laurent Destailleur
b0ea276233 Debug MO module 2019-11-04 14:13:36 +01:00
Laurent Destailleur
f242cf4cc1 Debug modulebuilder 2019-11-03 19:15:32 +01:00
Laurent Destailleur
b958997268 Clean code of APIs 2019-11-02 14:49:26 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019 
add comment
 2019-11-02 11:49:28 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Laurent Destailleur
a14aab5eb1 Fix template 2019-11-02 00:18:50 +01:00
Laurent Destailleur
941043dd67 Fix navigation on resources 2019-11-02 00:17:08 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
f74833cfe1 Make modulebuilder more compatible with multicompany 2019-11-01 18:44:32 +01:00
Laurent Destailleur
012c5ef0c4 Can use substitution variables into filter of fields link 2019-11-01 18:35:48 +01:00
Laurent Destailleur
2af23aa658 Enhance modulebuilder 2019-11-01 17:54:17 +01:00
Laurent Destailleur
e3b5be7475 All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed 
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
 2019-11-01 12:52:03 +01:00
Laurent Destailleur
af09c77a0c Fix phpcs 2019-10-31 22:15:18 +01:00
Laurent Destailleur
a1700e71be Fix phpcs 2019-10-31 21:18:38 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
645390c990 Work on BOM templates 2019-10-31 02:36:16 +01:00
stickler-ci
ae2dc713c4 Fixing style errors. 2019-10-30 09:03:43 +00:00
Philippe GRAND
a1bd895e41 add some comment 2019-10-30 10:04:03 +01:00
Laurent Destailleur
bc3f088f50 Enhance modulebuilder 
Work on MO
 2019-10-30 01:35:41 +01:00
Laurent Destailleur
7f1b67f0e4 Add warehouse for production on MO 2019-10-27 16:28:03 +01:00
Laurent Destailleur
afa3ed499f Can export BOMs 2019-10-27 15:56:20 +01:00
Laurent Destailleur
e17cc5b2e5 Debug cloning of BOMs 2019-10-27 00:26:11 +02:00
Laurent Destailleur
b4eb14ee44 Use dolGetStatus 2019-10-24 16:43:23 +02:00
Laurent Destailleur
6855f588b5 Use dolGetStatus 2019-10-24 16:38:06 +02:00
Laurent Destailleur
64ac113761 Show dictionaries of a module in module builder 2019-10-24 14:56:43 +02:00
Laurent Destailleur
7d6306dfa8 Look and feel v11 2019-10-24 13:09:50 +02:00
Laurent Destailleur
1ea3865f0d Look and feel v11 2019-10-24 13:01:03 +02:00
Laurent Destailleur
4ff53539a8 Exclude *.back 2019-10-24 11:51:24 +02:00
Laurent Destailleur
8768c553b1 Debug modulebuilder 2019-10-24 11:16:06 +02:00
Laurent Destailleur
d35c29a0fa Fix template 2019-10-23 22:30:06 +02:00
Laurent Destailleur
ce20cc39d1 Enhance template 2019-10-23 22:28:46 +02:00
Laurent Destailleur
9a386da7f5 NEW Can crop/resize image attached on a bank record 2019-10-23 16:07:09 +02:00
Laurent Destailleur
5ad7ca5620 Code more generic around setting projet on a card 2019-10-22 13:43:24 +02:00
Laurent Destailleur
aa4afcfe8a NEW Can set a filter on object linked in modulebuilder. 2019-10-22 03:49:09 +02:00
Laurent Destailleur
8e474701c1 Fix missing token 2019-10-21 15:49:08 +02:00
Laurent Destailleur
e261d63295 NEW Can add a button "Create" after combo of object with modulebuilder. 2019-10-21 14:44:39 +02:00
Frédéric FRANCE
360bf55f5b
clean indent 2019-10-20 01:09:11 +02:00
Laurent Destailleur
eb525769be Fix link to user 2019-10-17 20:32:11 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
205967976c Can set a BOM to draft 2019-10-16 18:35:15 +02:00
Laurent Destailleur
ffc4820970 Fix counter of BOM 2019-10-16 02:05:23 +02:00
Laurent Destailleur
d3df04c5aa Mutualize code 2019-10-16 01:36:07 +02:00
Laurent Destailleur
fb3d20107c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/exports/export.php
	htdocs/filefunc.inc.php
 2019-10-15 03:51:57 +02:00
Laurent Destailleur
056f7f826b Clean code 2019-10-14 20:41:28 +02:00
Laurent Destailleur
9ba992b8b6 Work on inventory module 2019-10-12 12:31:35 +02:00
Laurent Destailleur
dccfdad9dd Work on inventory feature 2019-10-12 11:32:47 +02:00
Laurent Destailleur
d9dde34ba6 Fix phpcs 2019-10-11 17:24:02 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Laurent Destailleur
f89701b4d4 Fix technical id align on left 2019-10-02 18:55:18 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
0f2b36bb82 Work on MRP module 2019-09-29 18:39:52 +02:00
Laurent Destailleur
db32ca99c6 Fix translation and sql request 2019-09-28 12:36:09 +02:00
Laurent Destailleur
86e5465197 Standardize extrafields code 2019-09-28 10:55:09 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
2286cc2a5f Fix autojump when 1 record found 2019-09-18 20:16:39 +02:00
Laurent Destailleur
9f6fe0bf5a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/orders.lang
 2019-09-14 18:27:58 +02:00
Laurent Destailleur
844f0903da Fix missing fields 2019-09-14 17:34:57 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Laurent Destailleur
66a9fabd06 If you develop your own emailing target selector and used 
parent::add_to_target(...), you must now use parent::addToTargets(...)
 2019-09-09 14:18:25 +02:00
Laurent Destailleur
d061e61d25 Fix add_to_target has only 1 param. 2019-09-09 13:45:25 +02:00
Laurent Destailleur
f6e04ba314 Fix sql error 2019-09-09 13:05:41 +02:00
Laurent Destailleur
c7bab8681a Fix sql error #11845 2019-09-09 13:05:08 +02:00
Laurent Destailleur
09d6826e62 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/supplier_order.php
	htdocs/langs/en_US/admin.lang
 2019-09-06 14:27:01 +02:00
Laurent Destailleur
bc0b8dfad0 FIX Consistency in direct debit order lists. 
FIX Confirmation of deletion
 2019-09-06 14:24:33 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
f893854986 Fix remove warnings 2019-09-05 14:24:13 +02:00
Laurent Destailleur
5f3c7cb8dc Fix compatibility with hooks tha add , at begin of sql string 2019-09-01 21:46:46 +02:00
Laurent Destailleur
5e00ca6066 Fix compatibility with hooks tha add , at begin of sql string 2019-09-01 21:45:09 +02:00
Laurent Destailleur
c81c8543da Fix bad param 2019-08-31 13:26:55 +02:00
Laurent Destailleur
a0a33dbe3e Fix bad param 2019-08-31 13:26:22 +02:00
Laurent Destailleur
85016a7a45 Fix bad error when module not enabled 2019-08-28 13:12:43 +02:00
Laurent Destailleur
f21cb54ae6 FIX management of extrafields in modulebuilder 2019-08-28 13:12:38 +02:00
Laurent Destailleur
b05b3e897f Fix bad error when module not enabled 2019-08-28 13:11:51 +02:00
Laurent Destailleur
55334dff3b FIX management of extrafields in modulebuilder 2019-08-28 13:04:22 +02:00
Laurent Destailleur
54203dda1f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/modules.php
 2019-08-21 16:25:48 +02:00
Laurent Destailleur
f98d3c5c48 FIX Do not show tooltip if tooltip is empty 2019-08-20 14:08:30 +02:00
Laurent Destailleur
b294f22285 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-04 13:07:09 +02:00
Laurent Destailleur
83412e3c90 Fix warning 2019-08-03 16:38:57 +02:00
Laurent Destailleur
5b2ca3b631 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2019-08-03 16:37:25 +02:00
Laurent Destailleur
76b7aa2e0f Fix fields with visible = 3 must not be visible into list 2019-08-02 19:20:19 +02:00
Laurent Destailleur
55e8aca47e Fix skeleton of module 2019-08-02 19:06:40 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
e5d34de877 FIX compatibility mysql 8. rank is reserved 
FIX Permission for BOM menu
 2019-07-09 00:14:01 +02:00
Laurent Destailleur
9405ce335e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 15:43:43 +02:00
Laurent Destailleur
657a3ae4c5 FIX permission to delete a draft purchase order 2019-07-04 12:43:32 +02:00
Laurent Destailleur
b177787f0a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
	htdocs/product/class/product.class.php
 2019-06-29 18:28:51 +02:00
Laurent Destailleur
a33071d779 FIX #11421 2019-06-28 12:52:35 +02:00
Laurent Destailleur
d048c0f125 Removed dead code 2019-06-24 23:00:04 +02:00
Laurent Destailleur
60596d4237
Merge pull request #11376 from bafbes/abb90061 
Fix:modulebuilder output folder
 2019-06-24 15:29:13 +02:00
Laurent Destailleur
a340bb616d
Update myobject_document.php 2019-06-24 15:28:13 +02:00
Laurent Destailleur
b202c7eaa0 Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
Bahfir Abbes
d949447670
Update myobject.class.php 2019-06-21 17:18:51 +01:00
Bahfir Abbes
79f6ec6fac
extend constant to objects into modules 2019-06-21 17:12:58 +01:00
Bahfir Abbes
78e44ef077
Update myobject.class.php 2019-06-20 23:35:35 +01:00
Abbes Bahfir
ce92036434 new:Show object photos in modulebuilder lists with a constant to format output as user list photos 2019-06-20 23:16:26 +01:00
Laurent Destailleur
6d38f5ec9c FIX #11369 2019-06-20 02:56:44 +02:00
Abbes Bahfir
1079535894 Fix:modulebuilder output folder 2019-06-19 17:57:17 +01:00
Laurent Destailleur
08d5ca4ddb Debug page to export accounting documents 2019-06-17 17:53:43 +02:00
Laurent Destailleur
900e860f6d Fix list of events for BOM module 2019-06-12 19:32:29 +02:00
Laurent Destailleur
e5754519cb Fix doxygen 2019-06-06 18:57:57 +02:00
Laurent Destailleur
06e0ec5e0c Fix link 2019-06-05 08:26:08 +02:00
Laurent Destailleur
969e139d5c Fix parameters of accessforbidden 2019-06-04 12:21:27 +02:00
Laurent Destailleur
664e0b81d8 Debug module BOM 2019-06-03 22:07:34 +02:00
Laurent Destailleur
a143dba9f8 Work on incomplete code on BOM module 2019-06-03 20:46:11 +02:00
Laurent Destailleur
72f55e1d81 Debug modulebuilder 2019-06-03 18:11:53 +02:00
Laurent Destailleur
cafb3840b7 Fix look and feel v10 2019-05-29 12:56:11 +02:00
Laurent Destailleur
42306835d2 Fix CSS 2019-05-29 09:38:19 +02:00
Laurent Destailleur
c131363dd1 Debug modulebuilder 2019-05-22 19:40:48 +02:00
Laurent Destailleur
7eeb028375 Debug modulebuilder 2019-05-22 19:34:08 +02:00
Laurent Destailleur
1e90a06ecb Fix module builder 2019-05-22 19:21:55 +02:00
Laurent Destailleur
18f1952e2d Fix set of properties 2019-05-22 14:49:18 +02:00
Laurent Destailleur
983ac4e758
Merge pull request #11220 from frederic34/patch-5 
printObjectLines return void
 2019-05-21 22:39:58 +02:00
Laurent Destailleur
c1a0e9385f
Merge pull request #11219 from frederic34/patch-2 
dol_print_object_info return void
 2019-05-21 22:38:39 +02:00
Laurent Destailleur
e463b17c15 Fix look and feel v10 2019-05-21 15:31:56 +02:00
Laurent Destailleur
3c1b860da4 Fix css 2019-05-20 12:16:39 +02:00
Laurent Destailleur
2debffe170 Debug modulebuilder for lines 2019-05-19 16:21:11 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
Frédéric FRANCE
7b317c4cbf
printObjectLines return void 2019-05-19 09:28:34 +02:00
Frédéric FRANCE
ff37fddcf1
Update myobject_agenda.php 2019-05-19 09:16:45 +02:00
Laurent Destailleur
2bbb04085e Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:15:01 +02:00
Laurent Destailleur
71ef8c881b Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:06:20 +02:00
Laurent Destailleur
c6ccb92a51 Fix table shown when there is no perm 
Fix edit admin status of another admin
 2019-05-19 01:41:42 +02:00
ATM-Marc
9b805f742b FIX: modulebuilder: hardcoded llx_ 2019-05-18 20:09:00 +02:00
Laurent Destailleur
30d91994b8
Merge pull request #11197 from homer8173/develop 
fix modulebuilder & takepos
 2019-05-18 00:56:49 +02:00
Laurent Destailleur
950b963762
Merge pull request #11196 from inoveaconseil/FIX#11045 
FIX #11045
 2019-05-18 00:55:38 +02:00
Laurent Destailleur
8fc5fdd1c7
Update myobject_card.php 2019-05-18 00:54:41 +02:00
Norbert Penel / OSCSS
f569785e85 fix modulebuilder 
tms mustn't have a not null
 2019-05-18 00:39:31 +02:00
Nicolas ZABOURI
9ab718ec5e FIX #11045 2019-05-18 00:19:06 +02:00
Nicolas ZABOURI
cf45bbb698 FIX #11160 2019-05-17 23:50:57 +02:00
Laurent Destailleur
bdb467b17a fix typo 2019-05-16 09:32:06 +02:00
Laurent Destailleur
3def11d5c9 Standardize translation 2019-05-10 19:32:46 +02:00
Laurent Destailleur
0bd4c61009 Fix default setup of module workflow was not set 2019-05-10 18:15:09 +02:00
Laurent Destailleur
3bf162dcd6 Clean code for v10 2019-05-09 14:36:48 +02:00
Laurent Destailleur
1e036f3513 Correct support for type price on module builder 
Fix link of ref in cash fence list
 2019-05-08 01:09:38 +02:00
Laurent Destailleur
dc1ee29fef Fix default permission of new users 2019-05-07 23:03:45 +02:00
Laurent Destailleur
0f8c7df6fe Debug api of module BOM 2019-05-02 12:19:43 +02:00
Laurent Destailleur
4756499a81 Debug module builder for generation of APIs 2019-05-02 12:03:14 +02:00
Laurent Destailleur
a77b46f072 Removed warnings 2019-04-23 12:52:48 +02:00
Frédéric FRANCE
5dbf31d975
Update myobject_list.php 2019-04-18 10:19:14 +02:00
Frédéric FRANCE
32b703e6c5
Update myobject_list.php 2019-04-18 09:33:47 +02:00
Laurent Destailleur
cf058e7d3b NEW Ask date of invoice when using the Clone feature. 2019-04-12 12:12:08 +02:00
Laurent Destailleur
26594fab98 Debug module ticket 2019-04-10 15:11:38 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
0091b65a83 Fix phpcs 2019-04-01 18:10:14 +02:00
Nicolas ZABOURI
1e9287c9d8 0.1 2019-03-28 23:57:17 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
e3dd62ed72 Fix type 2019-03-18 10:26:36 +01:00
Laurent Destailleur
b3dc6d7d1d NEW Generation of doc by modulebuilder can include README and CHANGELOG 2019-03-17 19:33:25 +01:00
Laurent Destailleur
39b9ca2397 Work on documentation generation by modulebuilder 2019-03-17 15:45:50 +01:00
Laurent Destailleur
d44be341a5 NEW Add property 'noteditable' in modulebuilder 2019-03-17 01:45:46 +01:00
Laurent Destailleur
c2badb57d7 NEW: Add module debugbar 2019-03-16 16:27:14 +01:00
Laurent Destailleur
e7cd8d690c Remove warnings 2019-03-13 19:06:45 +01:00
Laurent Destailleur
98ca9bf17a Reduce quantity of string to translates 2019-03-12 19:44:59 +01:00
Laurent Destailleur
d33fb9eff0 Work on BOM module 2019-03-12 19:30:32 +01:00
Laurent Destailleur
6ae36ce6a7 Work on BOM 2019-03-12 19:20:01 +01:00
Laurent Destailleur
fe6b682ec0 NEW Add visibility with value 4 in framework to define fields to show on 
forms and list but not on creation forms.
 2019-03-12 17:45:19 +01:00
Laurent Destailleur
935fe7c22a Debug and enhance modulebuilder. 2019-03-10 19:33:28 +01:00
Laurent Destailleur
1bd422b8b9 CSS 2019-03-10 14:45:16 +01:00
Laurent Destailleur
40afeebe2d
Merge pull request #10748 from frederic34/patch-2 
Update mailinglist_mymodule_myobject.modules.php
 2019-03-07 12:31:09 +01:00
Laurent Destailleur
401ad65975 Fix API explorer was broken due to corrupted API 2019-03-06 18:04:36 +01:00
Laurent Destailleur
0c2a0c643b NEW Performance enhancement: Replace dirname(__FILE__) with __DIR__ 2019-03-06 14:33:05 +01:00
Frédéric FRANCE
b4851e3d40
Update mailinglist_mymodule_myobject.modules.php 
Warning: Declaration of mailing_***********::add_to_target($mailing_id) should be compatible with MailingTargets::add_to_target($mailing_id, $cibles)
 2019-03-05 21:54:51 +01:00
Laurent Destailleur
0d6a2f446c
Merge pull request #10740 from frederic34/patch-4 
Update mymodulewidget1.php
 2019-03-05 18:43:02 +01:00
Frédéric FRANCE
162f2614e5
Update mymodulewidget1.php 2019-03-04 23:25:23 +01:00
Frédéric FRANCE
f283782445
change visibility 2019-03-04 19:57:46 +01:00
Frédéric FRANCE
ee9d0e2208
replace html by html5 in margin and modulebuilder 2019-03-03 09:08:29 +01:00
Laurent Destailleur
a5711a51ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/json.lib.php
	test/phpunit/JsonLibTest.php
 2019-03-02 18:30:17 +01:00
Frédéric FRANCE
40d34940f1
fix exclude from phpcs 2019-03-02 10:00:51 +01:00
Frédéric FRANCE
014f69850e
add visibility 2019-03-01 23:08:57 +01:00
Frédéric FRANCE
92c5c15033
add visibility 2019-02-28 20:48:07 +01:00
Frédéric FRANCE
675a17a74c
wip 2019-02-26 00:34:43 +01:00
Frédéric FRANCE
06db81f3c3
wip 2019-02-26 00:02:39 +01:00
Laurent Destailleur
e4698fb6a5 Merge 2019-02-18 19:14:25 +01:00
Laurent Destailleur
b1d19fe79a Removed not used file 2019-02-15 12:21:14 +01:00
Laurent Destailleur
205152501e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/public/payment/newpayment.php
 2019-02-12 13:39:39 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-12 13:33:39 +01:00
Laurent Destailleur
e8fc72ecf4
Merge pull request #10538 from frederic34/html5boxes 
replace html align by class in boxes
 2019-02-12 13:32:42 +01:00
Laurent Destailleur
9b8a13cfe6 Dolibarrize module ticket 2019-02-11 15:41:07 +01:00