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

3742 Commits

Author SHA1 Message Date
Frédéric FRANCE
c811d5a371
fix new pdf 2018-10-19 18:20:06 +02:00
Laurent Destailleur
fecb6e49c6
Merge pull request #9014 from atm-john/NEW_PDF_DOCUMENT_COLUMN_new_files 
Experimental new pdf documents  using new column system
 2018-10-19 15:51:54 +02:00
Frédéric FRANCE
6c85fbbc30
add log and comment 2018-10-18 21:47:10 +02:00
atm-quentin
ba997a0d0f FIX for mask 2018-10-18 14:48:20 +02:00
atm-quentin
8ef7c29d19 FIX PDF Total Ordered 2018-10-17 17:17:11 +02:00
atm-quentin
dd0a57d39e FIX pdf for creating invoice without massaction 2018-10-17 15:36:47 +02:00
Laurent Destailleur
550a66d338
Merge pull request #9772 from ptibogxiv/patch-76 
NEW move ticket dictionary in API /setup
 2018-10-16 21:39:30 +02:00
atm-quentin
354825d006 NEW modele pdf canelle_reception to display linked reception to line 2018-10-16 14:58:56 +02:00
Philippe GRAND
729ff0b9bb Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-16 14:20:11 +02:00
atm-quentin
83c8a78628 NEW auto event msg 2018-10-15 17:08:28 +02:00
Laurent Destailleur
6d4d8a0342 Dolibarize data privacy policy module 2018-10-15 14:05:54 +02:00
Maxime Kohlhaas
c66823d72f Fix numbering of supplier credit notes (issue #9624) 2018-10-14 17:07:38 +02:00
Philippe GRAND
effd11e1f9 translation 2018-10-13 12:42:01 +02:00
Philippe GRAND
94ea438881 Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-13 12:40:28 +02:00
Laurent Destailleur
e5cc4ae61b Code comment 2018-10-13 12:00:59 +02:00
Philippe GRAND
30630ff368 fix typo 2018-10-13 11:58:19 +02:00
atm-quentin
83e4d6bd13 NEW export reception 2018-10-11 15:28:28 +02:00
atm-quentin
7ad4a7e384 NEW creation facture fourn depuis reception 2018-10-09 16:26:40 +02:00
Laurent Destailleur
5d2f34dc1e
Merge pull request #9715 from inoveaconseil/datapolicies 
Dolibarization DataPolicies
 2018-10-09 16:03:14 +02:00
Inovea Conseil
768ab66d1f Datapolicies 2018-10-09 14:40:15 +02:00
atm-quentin
9f56540e75 NEW actions buttons done with stock movement 2018-10-09 11:33:41 +02:00
Philippe GRAND
bba6669f03 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-09 08:47:26 +02:00
atm-quentin
c6ab79bad3 NEW note, contact and lines on card 2018-10-08 16:54:33 +02:00
Laurent Destailleur
a0ba01321b Fix phpcs 2018-10-06 12:50:32 +02:00
Philippe GRAND
61daff6cb6 Standardize code 2018-10-06 12:34:51 +02:00
Laurent Destailleur
e24117e75b Fix position of modules is string on 2 digits 2018-10-06 11:57:53 +02:00
Laurent Destailleur
d1dde0ffac Include rgpd module with name DataPolicies 2018-10-06 02:51:47 +02:00
Laurent Destailleur
fd859d3162 Add a component to select lang into a web site 2018-10-03 18:40:54 +02:00
atm-quentin
41d8cb87a3 debut reception setup page 2018-10-03 12:22:41 +02:00
Laurent Destailleur
771922f427 Use 2 distinct left menu entries for leads and projects 2018-10-01 18:56:47 +02:00
Laurent Destailleur
1dfbb22bf8
Merge branch 'develop' into new_branch_13_09_2018 2018-10-01 02:20:16 +02:00
Frédéric FRANCE
c8ddf18558
Update mod_codeclient_monkey.php 2018-09-30 23:02:52 +02:00
Laurent Destailleur
aaa5efc77e Clean Take pos module 2018-09-28 22:06:04 +02:00
Laurent Destailleur
492b9c1a03 Fix phpcs 2018-09-28 18:03:53 +02:00
Laurent Destailleur
47da95fbbf Fix dependency of module 2018-09-28 13:50:37 +02:00
Laurent Destailleur
f990719daa Add experimental module TakePOS 2018-09-28 13:31:41 +02:00
Laurent Destailleur
a88dcfd1e4 Fix phpcs 2018-09-28 02:24:11 +02:00
Laurent Destailleur
60c74a6255
Merge pull request #9582 from grandoc/new_branch_21_09_2018 
Standardize and update code from New branch 21 09 2018
 2018-09-27 10:07:15 +02:00
Laurent Destailleur
26d20d0b76
Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price 
NEW Advanced permission to ignore price min
 2018-09-27 09:57:49 +02:00
Philippe Grand
031b3b44c5
Merge branch 'develop' into new_branch_13_09_2018 2018-09-27 09:42:58 +02:00
Philippe Grand
b7304e3d82
Merge branch 'develop' into new_branch_21_09_2018 2018-09-27 09:29:26 +02:00
Philippe GRAND
2799bd175d Translated comment 2018-09-23 21:35:43 +02:00
Laurent Destailleur
e277670a70
Merge pull request #9573 from grandoc/new_branch_20_09_2018 
Standardize and update code from New branch 20 09 2018
 2018-09-23 15:35:42 +02:00
Philippe GRAND
3464afe391 Update comment 2018-09-21 15:12:17 +02:00
Philippe Grand
870f504633
Update doc_generic_usergroup_odt.modules.php 2018-09-21 14:34:30 +02:00
Philippe Grand
0bcec6c923
Update doc_generic_user_odt.modules.php 2018-09-21 14:33:48 +02:00
Philippe Grand
2afaccf099
Update mod_ticket_universal.php 2018-09-21 14:32:31 +02:00
Philippe GRAND
9fab0a1d45 Update comments 2018-09-21 14:16:22 +02:00
Philippe GRAND
de6fca0844 fix merging 2018-09-21 14:09:12 +02:00
Philippe GRAND
48c3a1e1bc fix merging 2018-09-21 14:06:55 +02:00
Philippe Grand
d5003c9d3c
Merge branch 'develop' into new_branch_21_09_2018 2018-09-21 13:55:04 +02:00
Laurent Destailleur
7ece28ffd3 Trans 2018-09-21 11:48:01 +02:00
Frédéric FRANCE
7434b076d8
correct link to setup modulebuilder 2018-09-21 11:12:19 +02:00
Philippe Grand
239be3b58c
Merge branch 'develop' into new_branch_20_09_2018 2018-09-21 10:12:48 +02:00
Laurent Destailleur
8cfe5d7252
Merge pull request #9569 from grandoc/new_branch_19_09_2018 
Missing translation
 2018-09-21 09:50:18 +02:00
Laurent Destailleur
f7392871dd
Merge pull request #9579 from frederic34/patch-9 
remove warning Line exceeds 500 characters
 2018-09-21 09:40:28 +02:00
Philippe GRAND
bde8d8ae0e Comment and typo 2018-09-21 09:32:50 +02:00
Philippe GRAND
f59ac8dda5 Merge remote-tracking branch 'origin/new_branch_20_09_2018' into new_branch_21_09_2018 2018-09-21 09:07:17 +02:00
Laurent Destailleur
5bd538fb2c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/modules/modStripe.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/element.php
 2018-09-20 23:43:34 +02:00
Frédéric FRANCE
042555e716
remove warning Line exceeds 500 characters 2018-09-20 20:44:17 +02:00
Laurent Destailleur
4ba057528f Fix permissionss 2018-09-20 19:37:28 +02:00
Laurent Destailleur
36b8958c59 Move Stripe menu transactions and charges from develop to experimental 2018-09-20 19:35:13 +02:00
Philippe GRAND
e1a03c49cf Standardize and update code 2018-09-20 17:19:42 +02:00
Philippe GRAND
85ff212498 Standardize and update code 2018-09-20 17:11:29 +02:00
Philippe GRAND
e64fbd9522 Standardize and update code 2018-09-20 17:02:32 +02:00
Philippe GRAND
8225e039d9 Standardize and update code 2018-09-20 16:58:34 +02:00
Philippe GRAND
2adfdab771 Standardize and update code 2018-09-20 15:14:59 +02:00
Philippe GRAND
92a484dcd9 Standardize and update code 2018-09-20 15:07:43 +02:00
Philippe GRAND
7eda9c846c Standardize and update code 2018-09-20 15:01:03 +02:00
Philippe GRAND
b7a4311802 Standardize and update code 2018-09-20 14:56:40 +02:00
Philippe GRAND
b1fa12e1e3 Standardize and update code 2018-09-20 14:51:09 +02:00
Philippe GRAND
49fe6d3b79 Standardize and update code 2018-09-20 14:43:54 +02:00
Philippe GRAND
7c92157636 Standardize and update code 2018-09-20 14:25:53 +02:00
Philippe GRAND
7903a64c36 Standardize and update code 2018-09-20 14:23:09 +02:00
Philippe GRAND
11f254cd14 Standardize and update code 2018-09-20 14:19:52 +02:00
Philippe GRAND
cf8e12ced2 Standardize and update code 2018-09-20 14:15:39 +02:00
Philippe GRAND
12b56d17ba Standardize and update code 2018-09-20 14:11:59 +02:00
Philippe GRAND
0b4a0ac667 Standardize and update code 2018-09-20 14:09:25 +02:00
Philippe GRAND
4bd0af7a88 Standardize and update code 2018-09-20 14:05:57 +02:00
Philippe GRAND
bb0a830b78 Standardize and update code 2018-09-20 13:56:18 +02:00
Philippe GRAND
c0dc4f3a48 Standardize and update code 2018-09-20 13:52:57 +02:00
Philippe GRAND
7b50935e49 Standardize and update code 2018-09-20 13:44:45 +02:00
Philippe GRAND
a14c520910 Standardize and update code 2018-09-20 13:41:26 +02:00
Philippe GRAND
88bf2dee64 Standardize and update code 2018-09-20 13:36:00 +02:00
Philippe GRAND
7ffcc2e63f Standardize and update code 2018-09-20 13:32:41 +02:00
Philippe GRAND
cbda62b1ca Standardize and update code 2018-09-20 12:30:38 +02:00
Philippe GRAND
803505b6b7 Standardize and update code 2018-09-20 12:27:06 +02:00
Philippe GRAND
d091f5e16f Standardize and update code 2018-09-20 12:21:49 +02:00
Philippe GRAND
50073fe98d Standardize and update code 2018-09-20 12:16:31 +02:00
Philippe GRAND
bd87b1381d Standardize and update code 2018-09-20 12:14:30 +02:00
Philippe GRAND
d2d40ef0a3 Standardize and update code 2018-09-20 12:12:37 +02:00
Philippe GRAND
4b51227ca9 Standardize and update code 2018-09-20 12:10:13 +02:00
Philippe GRAND
5979db7733 Standardize and update code 2018-09-20 12:07:23 +02:00
Philippe GRAND
32beccc3be Standardize and update code 2018-09-20 12:02:23 +02:00
Philippe GRAND
67147582af Standardize and update code 2018-09-20 12:00:10 +02:00
Philippe GRAND
d5a3411fbc Standardize and update code 2018-09-20 11:28:54 +02:00
Philippe GRAND
08325d40ce Standardize and update code 2018-09-20 11:18:02 +02:00
Philippe GRAND
0222ea7e8c Standardize and update code 2018-09-20 09:19:17 +02:00
Philippe GRAND
1adc4bad9e Standardize and update code 2018-09-20 09:17:25 +02:00
Philippe GRAND
46d7385c54 Standardize and update code 2018-09-20 09:13:49 +02:00
Philippe GRAND
9b3dba4a56 Standardize and update code 2018-09-20 09:04:30 +02:00
Philippe GRAND
06ad6e7196 Standardize and update code 2018-09-20 09:04:12 +02:00
Philippe GRAND
9a487169c8 Standardize and update code 2018-09-20 09:03:52 +02:00
Philippe GRAND
ad84340bf5 Standardize and update code 2018-09-20 09:03:26 +02:00
Philippe GRAND
52533a0210 Standardize and update code 2018-09-19 16:43:37 +02:00
Philippe GRAND
bd3ba04e24 Standardize and update code 2018-09-19 16:36:08 +02:00
Philippe GRAND
57fc8cf06f Standardize and update code 2018-09-19 16:31:36 +02:00
Philippe GRAND
30e426e487 Standardize and update code 2018-09-19 16:21:52 +02:00
Laurent Destailleur
824b572bd0 FIX Amount when using mutlicurrency on PDF 
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2018-09-19 15:03:24 +02:00
Laurent Destailleur
2b67da3f34 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
 2018-09-19 14:52:43 +02:00
Laurent Destailleur
2643b6e1dd
Merge pull request #9558 from grandoc/new_branch_18_09_2018 
Standardize and update code
 2018-09-19 14:26:28 +02:00
Frédéric FRANCE
cdbb79a26c
correct typo in multicurrency doc pdf 2018-09-19 09:26:56 +02:00
Laurent Destailleur
2ec02afa8b Fix nb of module 2018-09-19 01:14:55 +02:00
Philippe GRAND
4536993fdc Standardize and update code 2018-09-18 17:34:01 +02:00
Philippe GRAND
c3db591d7b Standardize and update code 2018-09-18 17:31:01 +02:00
Philippe GRAND
73d161833a Standardize and update code 2018-09-18 17:26:20 +02:00
Philippe GRAND
d021a3d5af Standardize and update code 2018-09-18 17:24:10 +02:00
Philippe GRAND
30601accc3 Standardize and update code 2018-09-18 17:15:06 +02:00
Philippe GRAND
f28f3d12c2 Standardize and update code 2018-09-18 17:10:47 +02:00
Philippe GRAND
ac3efe1d5b Standardize and update code 2018-09-18 17:06:25 +02:00
Philippe GRAND
ad6ecc6231 Standardize and update code 2018-09-18 16:49:20 +02:00
Philippe GRAND
b4692f0812 fix merge 2018-09-18 16:45:06 +02:00
Laurent Destailleur
99d214abd5 Fix family of module Payment of employee salaries 2018-09-18 16:38:51 +02:00
Philippe GRAND
c3bbe70e2d fix merge 2018-09-18 16:38:14 +02:00
Philippe GRAND
ad061f4e13 Standardize and update code 2018-09-18 11:14:21 +02:00
Philippe GRAND
c08f443f0a Standardize and update code 2018-09-18 11:09:56 +02:00
Philippe GRAND
72f906683f Standardize and update code 2018-09-18 11:02:18 +02:00
Philippe GRAND
d1a27b33fb Standardize and update code 2018-09-17 17:28:05 +02:00
Philippe GRAND
b06516180b Standardize and update code 2018-09-17 15:06:41 +02:00
Laurent Destailleur
797de131a6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-17 02:26:15 +02:00
Laurent Destailleur
f3f18bf8cb Fix sql 2018-09-17 02:23:11 +02:00
Laurent Destailleur
cc4fbfc3ef Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-09-16 12:54:39 +02:00
Laurent Destailleur
d6ee00f2e7 Fix constructors does not need return value 2018-09-16 10:22:23 +02:00
Laurent Destailleur
eebd329c7c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modFacture.class.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/en_US/main.lang
	htdocs/stripe/transaction.php
 2018-09-16 09:50:13 +02:00
Laurent Destailleur
55e7989552 FIX #9043 2018-09-16 09:42:30 +02:00
Laurent Destailleur
2c8064967b Code comment 2018-09-16 09:31:06 +02:00
Laurent Destailleur
34b75828d3 Work on fix for #9043 2018-09-16 09:27:36 +02:00
Laurent Destailleur
6ba2127377
Merge pull request #9516 from grandoc/new_branch_15_09_2018 
New branch 15 09 2018
 2018-09-15 23:59:10 +02:00
Laurent Destailleur
69dcdcbe75
Merge pull request #9509 from grandoc/new_branch_14_09_2018 
Standardize and update code
 2018-09-15 17:30:14 +02:00
Philippe GRAND
0654b7b0ef Standardize and update code 2018-09-15 10:49:40 +02:00
Philippe GRAND
73c26a2d04 Standardize and update code 2018-09-15 10:47:50 +02:00
Philippe GRAND
fa1521d948 Standardize and update code 2018-09-14 15:09:23 +02:00
Philippe GRAND
ca9b1f155f Standardize and update code 2018-09-14 14:05:19 +02:00
Philippe GRAND
33d9e24bd6 Standardize and update code 2018-09-14 11:58:49 +02:00
John BOTELLA
d1321e5a7b change new PDF version 2018-09-14 09:54:39 +02:00
John BOTELLA
ec23cd0da4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_PDF_DOCUMENT_COLUMN_new_files 2018-09-14 09:54:14 +02:00
John BOTELLA
477acb2e4c change new PDF version 2018-09-14 09:48:15 +02:00
Laurent Destailleur
16ed582124 Add comment 2018-09-14 01:45:03 +02:00
Frédéric FRANCE
5862a5e2ee
printing remove no camelcaps function 2018-09-13 11:13:32 +02:00
Philippe GRAND
ffad80eef6 Standardize and update code 2018-09-13 09:45:07 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Laurent Destailleur
963d5eeddf
Merge pull request #9387 from frederic34/camelCaps2 
start changing phpcs:ignore
 2018-09-12 21:14:34 +02:00
Frédéric FRANCE
ce76a2e714
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 20:21:35 +02:00
Philippe GRAND
06cde1c35f Standardize and update code 2018-09-12 19:32:30 +02:00
Philippe GRAND
04017367f9 Standardize and update code 2018-09-12 19:24:45 +02:00
ias-ceo
fece67b629 use correct resultset 2018-09-12 19:00:19 +02:00
Laurent Destailleur
cb174c3d1a
Merge pull request #9455 from IAS-SYSTEMS-CSC/develop 
Fix : use correct resultset
 2018-09-12 18:59:45 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 18:32:15 +02:00
Laurent Destailleur
81f4bae159
Merge pull request #9461 from grandoc/new_branch_11_09_2018 
New branch 11 09 2018
 2018-09-12 18:15:03 +02:00
Laurent Destailleur
f5074f4962 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 18:12:17 +02:00
Philippe GRAND
b8df44167a Standardize and update code 2018-09-12 15:09:12 +02:00
Laurent Destailleur
729d03862f Fix warning 2018-09-12 15:02:59 +02:00
Philippe GRAND
69bf43f851 Merge remote-tracking branch 'upstream/develop' into new_branch_11_09_2018 2018-09-12 14:48:50 +02:00
Laurent Destailleur
fcabe67e4b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 13:30:28 +02:00
Laurent Destailleur
af2e19eba8 Replace skype module with social networks module to support more fields 2018-09-12 10:55:45 +02:00
Philippe GRAND
c51a0ef901 Standardize and update code 2018-09-12 10:10:07 +02:00
ias-ceo
b4691df8d9 use correct resultset 2018-09-10 17:29:29 +02:00
Frédéric FRANCE
a558c3bdac
replace select_date 2018-09-09 11:25:59 +02:00
Laurent Destailleur
0ef17fe581 FIX Problems with permissions of module to record payment of salaries 2018-09-07 13:32:56 +02:00
Frédéric FRANCE
ab4ae0f7bb
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-06 21:28:30 +02:00
Frédéric FRANCE
70ba223788
move phpcs:ignore 2018-09-06 21:27:18 +02:00
Frédéric FRANCE
cbf4a20a13
move phpcs:ignore 2018-09-06 19:03:09 +02:00
Frédéric FRANCE
3ecf788438
move phpcs:ignore 2018-09-06 18:29:01 +02:00
Laurent Destailleur
f7c87a9ad3 Clean cron init 2018-09-05 22:46:08 +02:00
Frédéric FRANCE
4cbfa2073a
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-05 21:02:16 +02:00
Frédéric FRANCE
85df267a5b
move phpcs:ignore 2018-09-05 20:36:44 +02:00
Laurent Destailleur
4ac67e6409 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-05 20:31:10 +02:00
Frédéric FRANCE
f7c3ca9d20
move phpcs:ignore 2018-09-05 18:49:06 +02:00
Laurent Destailleur
3650dc3ec9 FIX #8452 2018-09-05 15:25:47 +02:00
Frédéric FRANCE
ecc6c118a6
move phpcs:ignore 2018-09-04 23:26:37 +02:00
Frédéric FRANCE
7799774ca1
move phpcs:ignore 2018-09-04 22:52:55 +02:00
Frédéric FRANCE
3847df1de6
move phpcs:ignore 2018-09-04 21:53:53 +02:00
Frédéric FRANCE
c6cef85ccd
move phpcs:ignore 2018-09-04 21:16:17 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Frédéric FRANCE
fd6281b364
move phpcs:ignore 2018-09-04 20:00:09 +02:00
Frédéric FRANCE
1ae1afe843
move phpcs:ignore 2018-09-04 08:09:48 +02:00
Frédéric FRANCE
d08b68e8ed
move phpcs:ignore 2018-09-03 20:38:52 +02:00
Frédéric FRANCE
5f4a922c1d
move phpcs:ignore 2018-09-03 19:00:37 +02:00
Philippe GRAND
7a0c19485e fix merge 2018-09-03 09:34:08 +02:00
Frédéric FRANCE
e4946cc8eb
move phpcs:ignore 2018-09-03 00:03:17 +02:00
Frédéric FRANCE
9c3352d2de
move phpcs:ignore 2018-09-02 23:44:53 +02:00
Frédéric FRANCE
489074af5c
move phpcs:ignore 2018-09-02 23:25:10 +02:00
Frédéric FRANCE
2a9ef8dc05
move phpcs:ignore 2018-09-02 22:05:19 +02:00
Laurent Destailleur
0bf850c1ea Fix phpcs 2018-09-02 16:26:00 +02:00
Laurent Destailleur
3baaa2e975 Fix syntax error 2018-09-02 16:18:08 +02:00
Laurent Destailleur
b34731afb4
Merge pull request #9385 from frederic34/patch-15 
Update html_cerfafr.modules.php
 2018-09-02 15:38:19 +02:00
Laurent Destailleur
91809de1c3
Merge pull request #9383 from frederic34/patch-13 
Update doc_generic_user_odt.modules.php
 2018-09-02 15:35:54 +02:00
Philippe GRAND
5cd9557318 Standardize and Update code 2018-09-01 23:12:20 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Frédéric FRANCE
49a1e33fc9
Update html_cerfafr.modules.php 2018-09-01 16:23:30 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps 
mark non camelCaps function
 2018-09-01 15:37:56 +02:00
Frédéric FRANCE
ae52b737b3
Update doc_generic_user_odt.modules.php 2018-09-01 15:29:41 +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
Philippe GRAND
bd473059ae precise label comment 2018-09-01 14:13:05 +02:00
Laurent Destailleur
26cff9e11f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/langs/en_US/blockedlog.lang
	htdocs/stripe/config.php
 2018-09-01 14:13:01 +02:00
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 14:06:23 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Laurent Destailleur
b6f4b1dff7
Merge pull request #9363 from frederic34/patch-21 
Update modSociete.class.php
 2018-09-01 13:31:23 +02:00
Philippe GRAND
d8e6492e93 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 13:07:30 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing 
function Comment Missing
 2018-09-01 12:59:32 +02:00
Philippe GRAND
0e5d4206c9 Merge remote-tracking branch 'upstream/develop' into develop 2018-09-01 12:47:34 +02:00
Josep Lluís
bfaf7ae473 Fix: undefined rights_class on modules 
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
 2018-09-01 12:44:16 +02:00
Josep Lluís
79ee31df5c Fix: undefined rights_class on modules 
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
 2018-09-01 12:43:02 +02:00
Laurent Destailleur
8bd231adb0
Merge pull request #9357 from joseplluis/patch-3 
FIX undefined rights_class on modules may lose setup when module disabled
 2018-09-01 12:42:22 +02:00
Philippe GRAND
1944ef0dc3 conflict resolution 2018-09-01 12:38:22 +02:00
Laurent Destailleur
b863b5176d
Merge pull request #9322 from grandoc/new_branch_29_08_2018 
New branch 29 08 2018
 2018-09-01 12:11:01 +02:00
Frédéric FRANCE
9454f897ef
doxygen fix 2018-09-01 09:40:50 +02:00
Frédéric FRANCE
3b2e7732c2
function Comment Missing 2018-08-31 22:49:11 +02:00
Frédéric FRANCE
c2e49c82f8
function Comment Missing 2018-08-31 22:34:02 +02:00
Philippe GRAND
3a8bde227b Standardize and update code 2018-08-31 19:26:08 +02:00
Frédéric FRANCE
2eade6ea68
Update modSociete.class.php 2018-08-30 23:22:06 +02:00
Josep Lluís
d70e548f94
Fix: undefined rights_class on modules 
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
 2018-08-30 18:12:02 +02:00
Philippe GRAND
2e66c65650 WTF... 2018-08-30 12:03:20 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-29 18:45:36 +02:00
Philippe Grand
0ab593fdb1
Merge branch 'develop' into new_branch_29_08_2018 2018-08-29 12:47:01 +02:00
Philippe GRAND
d948c9e2db Fix white spaces 2018-08-29 12:42:55 +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
Philippe Grand
fa992c3e6d
Update modules_import.php 2018-08-28 10:44:18 +02:00
Philippe GRAND
65af8f902f Update and standardize code 2018-08-28 09:44:54 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing 
Trimtrailing
 2018-08-28 02:30:02 +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
Frédéric FRANCE
d8bf4a0ecf
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-25 09:07:04 +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
Philippe GRAND
74ce0bfea6 Standardize and update code 2018-08-23 16:54:24 +02:00
Philippe GRAND
aafa16afa5 Update and standardize code 2018-08-23 11:11:46 +02:00
Philippe GRAND
95349365ba Update and standardize code 2018-08-22 11:39:37 +02:00
Philippe GRAND
0ffad50974 Update and standardize code 2018-08-22 11:24:31 +02:00
Philippe GRAND
d91b1fd895 Update and standardize code 2018-08-22 11:06:34 +02:00
Philippe GRAND
a669830427 Update and standardize code 2018-08-22 10:37:16 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Frédéric FRANCE
c76a33fb4f
remove superfluous spaces 2018-08-21 20:12:27 +02:00
Frédéric FRANCE
0fbccce9a7
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 19:59:07 +02:00
Laurent Destailleur
21a9fd625f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-21 14:15:22 +02:00
Laurent Destailleur
5f6c165fb6 Module builder is stable 2018-08-21 14:14:27 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 14:03:02 +02:00