Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Laurent Destailleur
|
f96d730943
|
Merge pull request #10391 from grandoc/new_branch_22_01_2019
update with html5 compliant code
|
2019-01-26 14:09:15 +01:00 |
|
Laurent Destailleur
|
adb7ec7015
|
Merge pull request #10399 from grandoc/new_branch_23_01_2019
update with html5 compliant code
|
2019-01-26 14:02:26 +01:00 |
|
Laurent Destailleur
|
e42fe4022a
|
Uniformize lenght of small list
|
2019-01-25 15:22:36 +01:00 |
|
Philippe GRAND
|
6625dac8d7
|
update with html5 compliant code
|
2019-01-23 17:28:02 +01:00 |
|
Philippe GRAND
|
34b6f5705e
|
update with html5 compliant code
|
2019-01-22 14:09:14 +01:00 |
|
Philippe GRAND
|
4668052f95
|
update with html5 compliant code
|
2019-01-22 14:04:33 +01:00 |
|
Laurent Destailleur
|
844643c37d
|
Merge pull request #10375 from grandoc/new_branch_19_01_2019
update with html5 compliant code
|
2019-01-20 19:48:32 +01:00 |
|
Laurent Destailleur
|
300889f53a
|
# WARNING: head commit changed in the meantime
Fix
|
2019-01-19 13:22:38 +01:00 |
|
Laurent Destailleur
|
55c90b0578
|
Fix #10359 cloning of proposal
|
2019-01-19 13:17:07 +01:00 |
|
Laurent Destailleur
|
2bbaae88d6
|
Fix standardize 'createfromclone' param when cloning
|
2019-01-19 12:46:38 +01:00 |
|
Philippe GRAND
|
66e4bc4502
|
update with html5 compliant code
|
2019-01-19 12:27:26 +01:00 |
|
Laurent Destailleur
|
5130019003
|
css
|
2019-01-17 19:27:26 +01:00 |
|
Philippe GRAND
|
bd929c2d1e
|
update with html5 compliant code
|
2019-01-17 14:24:41 +01:00 |
|
atm-quentin
|
013c078c8b
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice
|
2019-01-16 10:52:46 +01:00 |
|
Marc de Lima Lucio
|
1cfd52e7e2
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_actionlist_desc
|
2019-01-09 12:08:55 +01:00 |
|
Marc de Lima Lucio
|
de7dfd3423
|
NEW: actioncomm list: add description column (hidden by default)
|
2019-01-09 11:54:03 +01:00 |
|
Laurent Destailleur
|
d929d93376
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-08 14:19:35 +01:00 |
|
Laurent Destailleur
|
acc665a9f1
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/class/html.form.class.php
|
2019-01-08 14:16:23 +01:00 |
|
Laurent Destailleur
|
1ee0d42408
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-01-08 14:08:22 +01:00 |
|
Marc de Lima Lucio
|
68802c659e
|
FIX: action list: add printFieldListSelect and printFieldListWhere hooks
|
2019-01-08 11:41:58 +01:00 |
|
ldestailleur
|
bc00fb177a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-02 19:42:15 +01:00 |
|
ldestailleur
|
3af418349a
|
FIX Can't empty the payment mode
|
2018-12-29 07:54:30 +01:00 |
|
ldestailleur
|
c0eef25b31
|
FIX Can set payment mode to empty on thirdparty page
|
2018-12-28 23:14:36 +01:00 |
|
ldestailleur
|
8ad06463e0
|
FIX Can set payment mode to empty on thirdparty page
|
2018-12-28 23:06:04 +01:00 |
|
Laurent Destailleur
|
a445e7597d
|
FIX Popup when having notes of events
|
2018-12-27 06:37:17 +01:00 |
|
Laurent Destailleur
|
fadc9983dc
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-12-27 06:18:03 +01:00 |
|
Laurent Destailleur
|
cd53e22d64
|
FIX Edit description of event
|
2018-12-27 06:16:54 +01:00 |
|
Laurent Destailleur
|
f55db6dd84
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
dev/resources/dbmodel/dolibarr_schema.mwb
|
2018-12-15 14:09:16 +01:00 |
|
Laurent Destailleur
|
e069da69ba
|
Revert "Fix screen size fall"
This reverts commit abb6b41f91.
|
2018-12-15 12:35:37 +01:00 |
|
John BOTELLA
|
4fa10296f4
|
Fix screen size fall
|
2018-12-15 12:34:41 +01:00 |
|
Laurent Destailleur
|
dbe5d285e8
|
Merge pull request #9965 from atm-john/fix_responsive
FIX screen size fall
|
2018-12-15 12:33:35 +01:00 |
|
Laurent Destailleur
|
b511a056f4
|
Fix phpcs
|
2018-12-15 11:48:21 +01:00 |
|
Laurent Destailleur
|
baf9b6f309
|
Fix regression (bad name of function)
|
2018-12-14 19:21:19 +01:00 |
|
Laurent Destailleur
|
38ddfd9a62
|
Merge pull request #10152 from defrance/patch-134
refactoring list.php with dol_sql_datefilter
|
2018-12-14 19:06:29 +01:00 |
|
Laurent Destailleur
|
3571eaee3d
|
Merge branch 'develop' into NEW_change_order_concat_desc
|
2018-12-14 17:44:08 +01:00 |
|
Laurent Destailleur
|
2011afe6fb
|
Merge branch 'develop' into actionrefused
|
2018-12-14 15:48:24 +01:00 |
|
Laurent Destailleur
|
83efdee7d3
|
Merge branch 'develop' into new_mass_generate
|
2018-12-14 15:44:46 +01:00 |
|
Laurent Destailleur
|
611ccc4a9a
|
Merge branch 'develop' into fieldlabel
|
2018-12-14 15:42:01 +01:00 |
|
Laurent Destailleur
|
233e160489
|
Merge pull request #9874 from atm-john/New_import_lines_from_linked_element_step2
NEW Extend import option to Order's card and Propal's card
|
2018-12-14 15:29:27 +01:00 |
|
Laurent Destailleur
|
5dabefe227
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2018-12-13 20:49:55 +01:00 |
|
Laurent Destailleur
|
f97b561af0
|
Merge branch 'develop' into qual_rename_facnumber
|
2018-12-13 20:24:12 +01:00 |
|
Laurent Destailleur
|
210c937725
|
Merge pull request #10213 from inoveaconseil/patch-5
NEW: Add note in tooltips
|
2018-12-13 20:06:13 +01:00 |
|
Laurent Destailleur
|
4a61c1b6ed
|
FIX lang not loaded
|
2018-12-11 13:25:09 +01:00 |
|
Laurent Destailleur
|
5ec9a1ca7f
|
Remove deprecated parameter
|
2018-12-11 10:15:13 +01:00 |
|
Laurent Destailleur
|
434cf2e046
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-12-11 09:58:14 +01:00 |
|
Laurent Destailleur
|
a107d16338
|
Revert "clean and update code"
This reverts commit 68de0ba93b.
|
2018-12-11 09:52:00 +01:00 |
|
Laurent Destailleur
|
b47e7b2267
|
Work on new unsubscribe process
|
2018-12-11 09:49:46 +01:00 |
|
Inovea Conseil
|
9bfcabc8c9
|
NEW: Add note in tooltips
|
2018-12-10 16:09:56 +01:00 |
|
Laurent Destailleur
|
138640fc63
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/contrat/class/contrat.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2018-12-04 14:58:11 +01:00 |
|
Laurent Destailleur
|
8e333c3feb
|
Standardize code
|
2018-12-04 14:54:58 +01:00 |
|
Laurent Destailleur
|
d80baaea69
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/contrat/class/contrat.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
|
2018-12-04 14:29:47 +01:00 |
|
Ferran Marcet
|
7247b14bd9
|
FIX Lines are not inserted correctly if VAT have code
|
2018-12-03 12:28:17 +01:00 |
|
Ferran Marcet
|
8312d57d16
|
FIX Lines are not inserted correctly if VAT have code
|
2018-12-03 11:58:39 +01:00 |
|
Maxime Kohlhaas
|
2e496ea83a
|
QUAL rename facnumber by ref
|
2018-12-02 17:33:44 +01:00 |
|
BENKE Charlene
|
21b55f3a83
|
refactoring dol_sql_datefilter
|
2018-12-01 23:30:58 +01:00 |
|
Laurent Destailleur
|
6d84036f66
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/index.php
htdocs/contact/list.php
htdocs/core/class/html.form.class.php
htdocs/expensereport/card.php
htdocs/install/doctemplates/shipment/template_shipment.odt
htdocs/public/payment/newpayment.php
|
2018-12-01 19:23:06 +01:00 |
|
florian HENRY
|
7a182c7880
|
fix #10069
|
2018-11-30 23:25:44 +01:00 |
|
Inovea Conseil
|
ad7117be60
|
FIX mass action closed proposal
|
2018-11-30 15:05:28 +01:00 |
|
BENKE Charlene
|
10bf7bdc95
|
Duplicate declaration of $object
Already present line 126
|
2018-11-29 10:29:04 +01:00 |
|
Laurent Destailleur
|
3b66a2bf9c
|
Fix missing email in popup
|
2018-11-28 14:20:55 +01:00 |
|
Laurent Destailleur
|
0367795488
|
Fix auto jump on record if only 1 record in a search
|
2018-11-27 11:09:47 +01:00 |
|
Laurent Destailleur
|
f0e4c262a3
|
Merge pull request #10067 from ATM-Thibault/NEW_global_search_go_direct_on_card
FIX Support of option MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE was not complete
|
2018-11-24 11:13:49 +01:00 |
|
Laurent Destailleur
|
5bd9c14929
|
Update demo data for 8.0 and 9.0
|
2018-11-23 14:05:45 +01:00 |
|
Thibault Descamps
|
c2e5a29246
|
NEW redirect if only one result on global search on card
|
2018-11-22 11:36:30 +01:00 |
|
Thibault Descamps
|
1cc130e5f6
|
NEW : conf to change concat desc order
|
2018-11-21 09:57:44 +01:00 |
|
Frédéric FRANCE
|
8f17ae8df5
|
GETPOSTISSET has only one parameter
|
2018-11-19 20:28:55 +01:00 |
|
Laurent Destailleur
|
39621ec686
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/commonobject.class.php
|
2018-11-19 20:07:51 +01:00 |
|
Laurent Destailleur
|
25ee999d27
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-11-19 20:05:32 +01:00 |
|
Laurent Destailleur
|
2f87ee6640
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-11-19 15:56:38 +01:00 |
|
Laurent Destailleur
|
f85ab8d0a6
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/comm/propal/card.php
|
2018-11-19 15:55:41 +01:00 |
|
Laurent Destailleur
|
5f93315097
|
Clean code
|
2018-11-19 15:14:46 +01:00 |
|
Laurent Destailleur
|
0886928a64
|
FIX Link between action and project must use field not the link table
|
2018-11-19 14:38:30 +01:00 |
|
Laurent Destailleur
|
1e1ccd4c88
|
Fix pagination in action/event list
|
2018-11-19 14:25:34 +01:00 |
|
florian HENRY
|
dc2f1e9812
|
fix list agenda extrafield visibility
|
2018-11-19 11:25:48 +01:00 |
|
atm-quentin
|
c18f486179
|
set facture to invoice AND check invoicenumber conf
|
2018-11-16 11:20:03 +01:00 |
|
atm-quentin
|
a8ab666d62
|
remplacement en masse des $conf->entity par des getEntity('facture')
|
2018-11-16 11:17:18 +01:00 |
|
Frédéric FRANCE
|
ce6b7adaa0
|
Merge remote-tracking branch 'upstream/develop' into actionrefused
|
2018-11-15 22:15:45 +01:00 |
|
Frédéric FRANCE
|
12dcda7e02
|
Merge remote-tracking branch 'upstream/develop' into fieldlabel
|
2018-11-15 22:01:36 +01:00 |
|
Regis Houssin
|
0592e8a31c
|
FIX config is override by multicompany module
|
2018-11-14 16:44:10 +01:00 |
|
Frédéric FRANCE
|
731d19a29b
|
add tooltip to butActionRefused
|
2018-11-13 21:40:17 +01:00 |
|
Regis Houssin
|
04edcaa89c
|
FIX compatibility between proposal sharing and proposalnumber sharing
|
2018-11-13 20:20:46 +01:00 |
|
gauthier
|
f404cae546
|
FIX : Same on customer card
|
2018-11-12 16:04:42 +01:00 |
|
gauthier
|
66ea8bbe87
|
FIX : fourn payment modes musn't be available on customer docs
|
2018-11-12 15:58:41 +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
|
de259e9db6
|
Code comment
|
2018-11-11 14:36:35 +01:00 |
|
Frédéric FRANCE
|
09efde4901
|
Merge remote-tracking branch 'upstream/develop' into fieldlabel
|
2018-11-09 18:13:59 +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 |
|
Laurent Destailleur
|
3e844db74f
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fichinter/stats/index.php
|
2018-11-08 20:19:28 +01:00 |
|
Laurent Destailleur
|
be788e6167
|
FIX responsive
|
2018-11-08 19:57:31 +01:00 |
|
Laurent Destailleur
|
46db246273
|
Look and feel v9: Autofocus on create forms
|
2018-11-07 13:04:43 +01:00 |
|
Laurent Destailleur
|
66ffcf287a
|
Fix filter on extrafields
|
2018-11-07 12:49:17 +01:00 |
|
John BOTELLA
|
abb6b41f91
|
Fix screen size fall
|
2018-11-07 11:25:13 +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
|
68ec172798
|
Fix setup to enable reminder b email
|
2018-11-03 12:37:52 +01:00 |
|
Frédéric FRANCE
|
fe5056add8
|
remove fieldlabel and add fieldeditkey
|
2018-10-27 18:07:05 +02:00 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Laurent Destailleur
|
852b069785
|
Fix reponsive in stats pages
|
2018-10-26 15:46:17 +02:00 |
|
atm-john
|
759b2b6ccf
|
Extend import option to Order's card and Propal's card
|
2018-10-25 21:39:22 +02:00 |
|
Frédéric FRANCE
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Laurent Destailleur
|
01adaf253c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/product/list.php
|
2018-10-24 03:35:44 +02:00 |
|
Laurent Destailleur
|
23a9416c19
|
Fix deprecated field
|
2018-10-23 23:51:27 +02:00 |
|
Laurent Destailleur
|
c8aa884462
|
Fix search all
|
2018-10-23 17:16:46 +02:00 |
|
Laurent Destailleur
|
9959ba3662
|
Merge pull request #9761 from frederic34/patch-20
Update actioncomm.class.php
|
2018-10-16 20:29:15 +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 |
|
Frédéric FRANCE
|
cab9c81ce2
|
Update actioncomm.class.php
|
2018-10-15 21:53:54 +02:00 |
|
Laurent Destailleur
|
743d4d7c01
|
NEW add option PROPOSAL_AUTO_ADD_AUTHOR_AS_CONTACT
|
2018-10-15 16:40:40 +02:00 |
|
Maxime Kohlhaas
|
d4d921b1cc
|
Add massaction generate on main lists
|
2018-10-14 16:27:59 +02:00 |
|
Laurent Destailleur
|
532e05c42e
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
|
2018-10-13 14:29:51 +02:00 |
|
Laurent Destailleur
|
c15505bc13
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-10-13 14:27:50 +02:00 |
|
Marc de Lima Lucio
|
afd9b4ea1a
|
FIX: propal pdf: missing parenthesis for customs code
|
2018-10-12 18:19:17 +02:00 |
|
Laurent Destailleur
|
1d04ce2185
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/functions.lib.php
|
2018-10-09 17:07:32 +02:00 |
|
Laurent Destailleur
|
01c32525df
|
Merge
|
2018-10-09 17:06:08 +02:00 |
|
Laurent Destailleur
|
0938ac4afa
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/user/list.php
|
2018-10-09 14:54:18 +02:00 |
|
Laurent Destailleur
|
3c8b365c3e
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-10-09 14:53:39 +02:00 |
|
Laurent Destailleur
|
4d959bbea7
|
Fix consistency of label of proposal status
|
2018-10-09 14:06:45 +02:00 |
|
Laurent Destailleur
|
bc4ddce314
|
Merge pull request #9713 from frederic34/patch-9
Update index.php
|
2018-10-09 12:43:32 +02:00 |
|
Frédéric FRANCE
|
b615d03b0b
|
Update index.php
|
2018-10-09 12:17:51 +02:00 |
|
Philippe GRAND
|
af0bcb2631
|
Standardize code
|
2018-10-09 09:40:00 +02:00 |
|
Philippe GRAND
|
ac214a7258
|
Standardize code
|
2018-10-09 08:53:08 +02:00 |
|
Laurent Destailleur
|
91038af84d
|
FIX properties on proposal must not be modified if error
|
2018-10-08 18:15:46 +02:00 |
|
Laurent Destailleur
|
c930218dd2
|
FIX Missing transaction around action
|
2018-10-08 17:40:17 +02:00 |
|
Philippe GRAND
|
da560289e3
|
Standardize code
|
2018-10-05 15:48:38 +02:00 |
|
atm-ph
|
bfaf25ca2a
|
Fix wrong value for module part and return access denied
|
2018-10-04 16:55:16 +02:00 |
|
Alexey Pyltsyn
|
49de7a5881
|
Replace multiple load calls with loadLangs method
|
2018-10-01 09:22:23 +03:00 |
|
Laurent Destailleur
|
e2f450aa8c
|
Fix regession losing description.
Rename updateligne into updateline.
|
2018-09-28 16:15:17 +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 |
|
Laurent Destailleur
|
d9ccc7624b
|
Standardize code
|
2018-09-23 16:09:25 +02:00 |
|
Laurent Destailleur
|
6c814b32bd
|
Standardize cod
|
2018-09-23 15:58:33 +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 |
|
Laurent Destailleur
|
eb80c5c338
|
Fix translation not loaded and test on multicompany
|
2018-09-20 19:45:13 +02:00 |
|
John BOTELLA
|
83d3e5ec39
|
NEW : can add project's task to agenda on create event card
|
2018-09-20 10:17:43 +02:00 |
|
Laurent Destailleur
|
a546ef7f2d
|
FIX default day
|
2018-09-19 20:01:25 +02:00 |
|
Laurent Destailleur
|
92aa6929de
|
Fix go back on agenda view on correct page
|
2018-09-19 17:03:13 +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 |
|
Frédéric FRANCE
|
1d43c6bc3a
|
call to deprecated add_object_linked was present two times
|
2018-09-19 10:57:59 +02:00 |
|
Laurent Destailleur
|
03928a914d
|
Merge pull request #9537 from frederic34/patch-20
reduce complexity of actioncomm reminder class
|
2018-09-18 15:08:46 +02:00 |
|
Frédéric FRANCE
|
beb7a0609c
|
reduce complexity of actioncomm reminder class
|
2018-09-16 19:06:21 +02:00 |
|
Frédéric FRANCE
|
7b37c41cfb
|
reduce complexity of actioncomm class
|
2018-09-16 19:04:43 +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
|
74a9c680df
|
FIX "Other ..." link so the "Back to" link works.
|
2018-09-16 12:27:56 +02:00 |
|
Laurent Destailleur
|
4efab446d0
|
Merge pull request #9508 from frederic34/patch-15
reduce complexity of libstatut propal.class.php
|
2018-09-15 17:24:59 +02:00 |
|
Laurent Destailleur
|
80fb1e0657
|
NEW Each user can set its prefered default calendar
|
2018-09-14 11:23:15 +02:00 |
|
Frédéric FRANCE
|
bcc9a3d259
|
reduce complexity of libstatut propal.class.php
|
2018-09-13 21:45:46 +02:00 |
|
Frédéric FRANCE
|
987fdbe73c
|
Merge remote-tracking branch 'upstream/develop' into patch-6
|
2018-09-12 21:29:41 +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
|
6291f18179
|
Merge pull request #9440 from frederic34/patch-5
Upper Lower Casing
|
2018-09-12 18:24:02 +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 |
|
Frédéric FRANCE
|
f02b2f0239
|
Merge remote-tracking branch 'upstream/develop' into patch-6
|
2018-09-09 13:35:58 +02:00 |
|
Frédéric FRANCE
|
fa895b2c2d
|
replace select_date
|
2018-09-09 11:30:40 +02:00 |
|
Frédéric FRANCE
|
a558c3bdac
|
replace select_date
|
2018-09-09 11:25:59 +02:00 |
|
Frédéric FRANCE
|
8249756726
|
replace select_date
|
2018-09-09 10:40:00 +02:00 |
|
Frédéric FRANCE
|
14bc8ed18d
|
Update multiprix.php
|
2018-09-08 23:19:11 +02:00 |
|
Frédéric FRANCE
|
2b62c4ca8f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-08 10:50:27 +02:00 |
|
Philippe GRAND
|
97c740f510
|
Merge branch 'develop' of github.com:grandoc/dolibarr into develop
|
2018-09-06 19:28:10 +02:00 |
|
Laurent Destailleur
|
ff05997f0a
|
FIX Several fixes on the management of minimal amount for orders
|
2018-09-06 17:37:02 +02:00 |
|
Frédéric FRANCE
|
4e619dd0ed
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-05 18:51:21 +02:00 |
|
Frédéric FRANCE
|
aa74d2ac38
|
Update api_agendaevents.class.php
|
2018-09-04 23:53:37 +02:00 |
|
Laurent Destailleur
|
ab8155f170
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
|
2018-09-04 21:35:43 +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
|
c32c67ca57
|
Merge branch 'develop' into develop
|
2018-09-04 16:58:59 +02:00 |
|
Philippe GRAND
|
707f8b7312
|
fix merge
|
2018-09-04 14:49:56 +02:00 |
|
Laurent Destailleur
|
3d50c454c1
|
Code comment
|
2018-09-03 17:05:44 +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
|
e13a8ec572
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-02 18:19:45 +02:00 |
|
Frédéric FRANCE
|
4ea582ad4a
|
move phpcs:ignore
|
2018-09-02 11:12:07 +02:00 |
|
Philippe GRAND
|
3de16a145e
|
Standardize and update code
|
2018-09-02 11:08:41 +02:00 |
|
Frédéric FRANCE
|
b60f7db60a
|
move phpcs:ignore
|
2018-09-02 10:43:34 +02:00 |
|
Frédéric FRANCE
|
47879d44bc
|
move phpcs:ignore
|
2018-09-02 09:57:19 +02:00 |
|
Frédéric FRANCE
|
e98b8e5e25
|
move phpcs:ignore
|
2018-09-02 09:27:59 +02:00 |
|
Frédéric FRANCE
|
71977514d7
|
Update actioncommreminder.class.php
|
2018-09-02 09:06:51 +02:00 |
|
Frédéric FRANCE
|
3e723af018
|
start changing phpcs:ignore
|
2018-09-01 23:46:13 +02:00 |
|
Philippe GRAND
|
ae2df6be11
|
Standardize and Update code
|
2018-09-01 23:04:46 +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
|
f77dd2ebc7
|
Standardize and update code
|
2018-09-01 15:13:59 +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 |
|
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 |
|
Philippe GRAND
|
7354e485b0
|
precise label comment
|
2018-09-01 13:22:08 +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
|
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 |
|
Laurent Destailleur
|
482ddd548a
|
Merge pull request #9332 from frederic34/functionClosingBrace
PSR2 FunctionClosingBrace
|
2018-09-01 12:06:08 +02:00 |
|
Frédéric FRANCE
|
9454f897ef
|
doxygen fix
|
2018-09-01 09:40:50 +02:00 |
|
Philippe GRAND
|
9e880d3e72
|
Standardize and update code
|
2018-08-31 17:55:31 +02:00 |
|
Laurent Destailleur
|
7b1a705be4
|
Clean duplicate code
|
2018-08-31 13:50:58 +02:00 |
|
Philippe Grand
|
b3c84ac3bc
|
Merge branch 'develop' into new_branch_29_08_2018
|
2018-08-30 12:09:40 +02:00 |
|
ksar-ksar
|
49d3bea192
|
Remove the test
After discussion with Frederic, the best solution is to remove the test
|
2018-08-30 11:27:48 +02:00 |
|
Frédéric FRANCE
|
5100b8b7b0
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-30 10:42:47 +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 |
|
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
|
8b291b2053
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
README.md
|
2018-08-29 19:55:10 +02:00 |
|
Laurent Destailleur
|
0c11007e34
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
README.md
htdocs/comm/propal/card.php
|
2018-08-29 18:53:39 +02:00 |
|
Frédéric FRANCE
|
cbdc669ba9
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-29 18:45:36 +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 |
|
Frédéric FRANCE
|
7b2bfb28c2
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing2
|
2018-08-29 12:48:12 +02:00 |
|
Philippe Grand
|
0ab593fdb1
|
Merge branch 'develop' into new_branch_29_08_2018
|
2018-08-29 12:47:01 +02:00 |
|
Laurent Destailleur
|
b648a28893
|
Fix regression
|
2018-08-29 11:57:43 +02:00 |
|
Frédéric FRANCE
|
846778657f
|
fix syntax error
|
2018-08-29 11:44:26 +02:00 |
|
Philippe GRAND
|
5b0425706c
|
try to fix space errors
|
2018-08-29 11:39:38 +02:00 |
|
Philippe GRAND
|
84a9ca3f68
|
fix : Parse error: ./htdocs/comm/mailing/cibles.php:644
|
2018-08-29 10:40:30 +02:00 |
|
gauthier
|
61a57e619f
|
FIX : $fk_account is always empty, must be $soc->fk_account
|
2018-08-28 16:54:04 +02:00 |
|
Frédéric FRANCE
|
fe4260a014
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-28 09:34:53 +02:00 |
|
Frédéric FRANCE
|
1182f29864
|
trimtrailing
|
2018-08-28 08:33:02 +02:00 |
|
Laurent Destailleur
|
2349f99eb9
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-08-28 02:58:51 +02:00 |
|
Laurent Destailleur
|
50d50c2e10
|
Merge pull request #9307 from ATM-Marc/FIX_6.0_thirdparty_info
NEW On customer/supplier card, add simple tooltip to amount boxes
|
2018-08-28 02:48:05 +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
|
9a14611d55
|
Merge pull request #8996 from grandoc/new_branch_20_06_2018
clean and update code
|
2018-08-28 02:35:59 +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
|
32ef9695a7
|
Merge pull request #9282 from frederic34/patch-19
Update card.php
|
2018-08-28 02:28:35 +02:00 |
|
Laurent Destailleur
|
7462a1ae1d
|
Update card.php
|
2018-08-28 02:27:56 +02:00 |
|
Laurent Destailleur
|
2306f8a7c2
|
Merge pull request #9265 from grandoc/new_branch_18_08_2018
Typo
|
2018-08-28 02:25:24 +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
|
d90eed3098
|
Merge pull request #9291 from frederic34/patch-23
typo
|
2018-08-28 01:55:44 +02:00 |
|
Laurent Destailleur
|
534eadb7a2
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-08-28 01:35:43 +02:00 |
|
Marc de Lima Lucio
|
d09f9b2543
|
FIX: customer/supplier card: add simple tooltip to amount boxes
|
2018-08-27 18:19:42 +02:00 |
|
atm-ph
|
d9beb3f882
|
Fix tms missing in fetch propal
|
2018-08-27 10:19:07 +02:00 |
|
ksar-ksar
|
a844855ade
|
Update hook formConfirm
The hook should be called when the $formconfirm is not empty
|
2018-08-24 16:40:26 +02:00 |
|
Frédéric FRANCE
|
85ae8f3901
|
Update card.php
|
2018-08-24 09:29:17 +02:00 |
|
Philippe GRAND
|
2fa82edd39
|
Standardize and update code
|
2018-08-23 17:07:27 +02:00 |
|
Frédéric FRANCE
|
343e6ce8b3
|
typo
|
2018-08-23 14:34:27 +02:00 |
|
Philippe Grand
|
f98d2078e2
|
Merge branch 'develop' into new_branch_20_06_2018
|
2018-08-23 10:41:34 +02:00 |
|
Philippe Grand
|
9b2e754b46
|
Update advtargetemailing.class.php
|
2018-08-22 22:41:22 +02:00 |
|
Philippe Grand
|
eeaa257f11
|
Update cactioncomm.class.php
|
2018-08-22 22:39:51 +02:00 |
|
Philippe Grand
|
c626dcb710
|
Update actioncomm.class.php
|
2018-08-22 22:38:00 +02:00 |
|
Philippe GRAND
|
449ef9c464
|
Update and standardize code
|
2018-08-22 18:12:44 +02:00 |
|
Frédéric FRANCE
|
0334409d18
|
Update card.php
|
2018-08-22 13:43:30 +02:00 |
|
Philippe GRAND
|
6542dcf0bd
|
Update and standardize code
|
2018-08-22 12:04:50 +02:00 |
|
Philippe GRAND
|
e0462b975b
|
Update and standardize code
|
2018-08-22 11:48:26 +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
|
29f15b4ae6
|
Update and standardize code
|
2018-08-22 10:51:55 +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
|
0fbccce9a7
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-21 19:59:07 +02:00 |
|
Laurent Destailleur
|
db3c17668e
|
Fix coding style
|
2018-08-21 19:08:11 +02:00 |
|
Frédéric FRANCE
|
aba69b94b2
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-21 14:03:02 +02:00 |
|
Laurent Destailleur
|
0799970804
|
Merge pull request #9248 from frederic34/FunctionDeclaration
function declaration
|
2018-08-21 13:41:56 +02:00 |
|
Laurent Destailleur
|
85eed6cf80
|
Merge branch 'develop' into trimtrailing
|
2018-08-21 13:40:04 +02:00 |
|