John Botella
|
9b84987cc1
|
prepare new dashboard
|
2019-08-01 12:33:19 +02:00 |
|
Laurent Destailleur
|
5eb8f05061
|
FIX #11584
|
2019-08-01 12:23:02 +02:00 |
|
Laurent Destailleur
|
11e3aa5860
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-29 11:07:11 +02:00 |
|
Laurent Destailleur
|
7931f0b422
|
Fix sql error
|
2019-07-29 11:06:39 +02:00 |
|
Laurent Destailleur
|
a5e3adc6f1
|
Fix travis
|
2019-07-29 10:51:17 +02:00 |
|
Laurent Destailleur
|
db461792a0
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-29 01:36:35 +02:00 |
|
Laurent Destailleur
|
9a7113f4f5
|
FIX Update the file index table when we validate/rename a ref.
|
2019-07-28 22:26:55 +02:00 |
|
Laurent Destailleur
|
a61a435095
|
Fix tab title
|
2019-07-23 02:54:49 +02:00 |
|
Laurent Destailleur
|
bf55733678
|
NEW Replace the "info" tab on contract with the more complete "agenda"
tag.
|
2019-07-23 02:45:31 +02:00 |
|
Alexandre SPANGARO
|
5f042cf6ad
|
QUAL Move ligne.php to line.php
|
2019-07-19 23:19:06 +02:00 |
|
Laurent Destailleur
|
f5cc29417d
|
Translation lignes -> lines
|
2019-07-05 21:50:35 +02:00 |
|
Laurent Destailleur
|
7de92070d7
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/contrat/card.php
htdocs/contrat/class/contrat.class.php
|
2019-06-29 16:46:16 +02:00 |
|
Laurent Destailleur
|
adb3062a9f
|
Work on nblignes -> nblines
|
2019-06-29 16:38:14 +02:00 |
|
Laurent Destailleur
|
c0ba22fc6c
|
Merge pull request #11406 from ptibogxiv/patch-194
NEW Can load multilang translation in same step than fetch_lines
|
2019-06-28 14:04:06 +02:00 |
|
ptibogxiv
|
30dd3a76d2
|
Update contrat.class.php
|
2019-06-26 08:23:06 +02:00 |
|
Laurent Destailleur
|
68bc096ef3
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-25 23:41:56 +02:00 |
|
Laurent Destailleur
|
a68d9fc5e6
|
Fix css
|
2019-06-25 23:31:29 +02:00 |
|
ptibogxiv
|
c813c33e42
|
Update contrat.class.php
|
2019-06-25 18:13:53 +02:00 |
|
ptibogxiv
|
87d4e4e356
|
Update contrat.class.php
|
2019-06-25 15:49:47 +02:00 |
|
ptibogxiv
|
a9adccabc3
|
Update contrat.class.php
|
2019-06-25 15:48:41 +02:00 |
|
Laurent Destailleur
|
43d65e8073
|
Add hook
|
2019-06-24 22:59:00 +02:00 |
|
Laurent Destailleur
|
83ec64d473
|
Add hook getnomurltooltip on contract
|
2019-06-24 22:52:27 +02:00 |
|
ICstage
|
820c420ae5
|
FIX Missing hooks
|
2019-06-18 14:07:52 +02:00 |
|
Francis Appels
|
1688bc3f7e
|
Merge branch '10' into clean_10_beta
|
2019-06-12 14:38:25 +02:00 |
|
Laurent Destailleur
|
a143dba9f8
|
Work on incomplete code on BOM module
|
2019-06-03 20:46:11 +02:00 |
|
Francis Appels
|
e496967235
|
Fix scrutinizer, wrong unitprice var
|
2019-05-30 17:30:53 +02:00 |
|
Laurent Destailleur
|
cf70b26db7
|
Add distinct id
|
2019-05-29 10:27:03 +02:00 |
|
Laurent Destailleur
|
2218994958
|
FIX Duplicate encoding on error message
|
2019-05-29 09:51:45 +02:00 |
|
Laurent Destailleur
|
eafc35b00f
|
Look and feel v10
|
2019-05-21 13:27:45 +02:00 |
|
Laurent Destailleur
|
5f23cf7e2a
|
CSS
|
2019-05-19 13:51:47 +02:00 |
|
Laurent Destailleur
|
11fea03074
|
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
NEW : look and feel title button
|
2019-05-18 16:04:47 +02:00 |
|
Laurent Destailleur
|
c1ec7454a1
|
Merge branch 'develop' into clean_10_beta
|
2019-05-16 21:21:51 +02:00 |
|
Laurent Destailleur
|
ac1bab1711
|
Fix sanitize params
|
2019-05-16 12:28:57 +02:00 |
|
Francis Appels
|
79a347ab11
|
Fix PHPCS contract list
|
2019-05-13 22:49:43 +02:00 |
|
Laurent Destailleur
|
75646e365d
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contrat/list.php
htdocs/contrat/services_list.php
htdocs/expensereport/list.php
htdocs/product/list.php
htdocs/product/reassort.php
htdocs/product/reassortlot.php
htdocs/projet/list.php
|
2019-05-13 12:28:16 +02:00 |
|
Laurent Destailleur
|
9242c1a630
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
ChangeLog
htdocs/contrat/services_list.php
htdocs/core/lib/files.lib.php
htdocs/filefunc.inc.php
htdocs/product/list.php
|
2019-05-13 12:22:14 +02:00 |
|
Juanjo Menent
|
f4ca6916cd
|
Merge remote-tracking branch 'upstream/7.0' into 8.0
# Conflicts:
# htdocs/contrat/services_list.php
# htdocs/expensereport/list.php
# htdocs/projet/list.php
|
2019-05-11 17:31:23 +02:00 |
|
Juanjo Menent
|
3ae2d71ea6
|
Fix: missing GETPOST params
|
2019-05-11 17:00:55 +02:00 |
|
Juanjo Menent
|
91ae365588
|
Fix: missing GETPOST params
|
2019-05-11 16:58:00 +02:00 |
|
Laurent Destailleur
|
3def11d5c9
|
Standardize translation
|
2019-05-10 19:32:46 +02:00 |
|
Laurent Destailleur
|
648b2506ab
|
FIX visible ref on contract link for old contract without ref
|
2019-05-04 11:45:31 +02:00 |
|
Laurent Destailleur
|
8442c86436
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/functions.lib.php
htdocs/index.php
|
2019-05-02 17:40:41 +02:00 |
|
Laurent Destailleur
|
4e94d92b70
|
Fix link
|
2019-05-02 17:24:05 +02:00 |
|
Laurent Destailleur
|
9b21c827c3
|
Fix remove var_dump
|
2019-05-02 17:17:52 +02:00 |
|
Laurent Destailleur
|
4899d03ff8
|
FIX Confusion between expired and late
|
2019-05-02 17:15:24 +02:00 |
|
Laurent Destailleur
|
091132de2f
|
Signatures of methods createFromClone() has been standardized. All
methods requires the object User as first parameter.
|
2019-04-25 12:11:32 +02:00 |
|
Laurent Destailleur
|
e6ffaeefe5
|
CSS
|
2019-04-17 10:39:30 +02:00 |
|
ATM john
|
07e6ce5460
|
Appli function to links
|
2019-04-15 21:33:31 +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
|
7b01e76d2b
|
Fix doxygen
|
2019-04-08 16:04:15 +02:00 |
|
Laurent Destailleur
|
8a6e28860b
|
A better transition with deprecation
|
2019-04-01 22:09:24 +02:00 |
|
Laurent Destailleur
|
2b41d0c59d
|
Merge pull request #10938 from inoveaconseil/HookPrintFieldLIstFooter
FIX missing hook
|
2019-03-31 18:44:07 +02:00 |
|
Laurent Destailleur
|
1b2826f476
|
Look and feel v10
|
2019-03-29 13:26:26 +01:00 |
|
Nicolas ZABOURI
|
0ab6b15779
|
FIX missing hook printFieldListFooter
|
2019-03-28 17:27:30 +01:00 |
|
Laurent Destailleur
|
a34f4c2806
|
Merge pull request #10909 from IonAgorria/fix-line-dates
FIX: Disallow line start date after end date
|
2019-03-26 19:43:11 +01:00 |
|
Laurent Destailleur
|
12c5844065
|
Look and feel v10
|
2019-03-26 11:55:22 +01:00 |
|
Laurent Destailleur
|
f27f65e8bf
|
Responsive
|
2019-03-25 10:09:02 +01:00 |
|
Laurent Destailleur
|
82381533dd
|
Better responsive
|
2019-03-25 09:14:28 +01:00 |
|
Ion
|
7bfa49b29c
|
FIX: Disallow line start date > end date
|
2019-03-24 14:30:00 +01:00 |
|
Laurent Destailleur
|
28fede950f
|
Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
|
2019-03-22 13:00:48 +01:00 |
|
Philippe GRAND
|
c13a1dbc63
|
translation
|
2019-03-18 13:45:24 +01:00 |
|
Lionel VESSILLER
|
971037d755
|
Fix dol_print_date error for real dates in cotract card
|
2019-03-15 08:42:00 +01:00 |
|
Laurent Destailleur
|
98ca9bf17a
|
Reduce quantity of string to translates
|
2019-03-12 19:44:59 +01:00 |
|
Joan Louis
|
17647de4cc
|
Fix extrafields calls from cards for Dolibarr 8 See #10803
|
2019-03-12 11:24:54 +01:00 |
|
Joan Louis
|
f326c75be7
|
Update call to extrafields from cards
|
2019-03-11 21:34:16 +01:00 |
|
Joan Louis
|
ee5753819e
|
Update call to extrafields from cards
|
2019-03-11 14:22:04 +01:00 |
|
Laurent Destailleur
|
b710e28ffa
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/admin/adherent.php
htdocs/admin/barcode.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/langs/en_US/admin.lang
|
2019-03-09 01:20:13 +01:00 |
|
Laurent Destailleur
|
57b9be53b3
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/contrat/class/contrat.class.php
|
2019-03-09 00:44:31 +01:00 |
|
Laurent Destailleur
|
4022d5f529
|
FIX Can not create contract with numbering module without autogen rule
|
2019-03-08 23:58:04 +01:00 |
|
Frédéric FRANCE
|
f283782445
|
change visibility
|
2019-03-04 19:57:46 +01:00 |
|
Frédéric FRANCE
|
bf1e1d6a57
|
replace html by html5 in contrat
|
2019-03-03 09:37:43 +01:00 |
|
Laurent Destailleur
|
4f9981063f
|
Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing
|
2019-03-02 18:26:50 +01:00 |
|
Laurent Destailleur
|
56d921ea52
|
CSS
|
2019-03-02 12:57:07 +01:00 |
|
Frédéric FRANCE
|
bd2e541fd6
|
add visibility
|
2019-03-01 18:28:51 +01:00 |
|
Laurent Destailleur
|
b3fb0eaf5b
|
Merge branch 'develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-27 15:48:31 +01:00 |
|
Laurent Destailleur
|
2448d1deaa
|
fk_projet -> fk_project
|
2019-02-27 15:32:18 +01:00 |
|
Frédéric FRANCE
|
81f2f99db5
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-26 21:16:01 +01:00 |
|
Laurent Destailleur
|
3ec2338c2d
|
Look and feel v10
|
2019-02-26 19:37:32 +01:00 |
|
Frédéric FRANCE
|
1c07006015
|
wip
|
2019-02-25 21:36:27 +01:00 |
|
Laurent Destailleur
|
0a83bc474c
|
Merge pull request #10635 from grandoc/new_branch_19_02_2019
update with html5 compliant code
|
2019-02-23 14:09:17 +01:00 |
|
Laurent Destailleur
|
afae29198d
|
Missing function 'getFormatedCustomerRef' and 'getFormatedsupplierRef'
|
2019-02-21 17:03:24 +01:00 |
|
Philippe GRAND
|
3a2b5e28c4
|
update with html5 compliant code
|
2019-02-19 17:17:11 +01:00 |
|
Philippe GRAND
|
f24356ae10
|
update with html5 compliant code
|
2019-02-19 17:08:35 +01:00 |
|
Philippe GRAND
|
5b7294e9e1
|
update with html5 compliant code
|
2019-02-19 17:06:25 +01:00 |
|
Philippe GRAND
|
2c59569074
|
update with html5 compliant code
|
2019-02-19 17:02:07 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Laurent Destailleur
|
57f81217ee
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/index.php
|
2019-02-03 21:14:44 +01:00 |
|
Laurent Destailleur
|
a520642d97
|
FIX Price in combo list of service does not use the correct price level
|
2019-02-03 19:54:55 +01:00 |
|
Laurent Destailleur
|
a6dde3d6bd
|
Merge branch 'develop' into nospaceaftercomma
|
2019-02-03 19:27:16 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
4f9f0fd7b5
|
Merge branch 'develop' into elseif
|
2019-01-27 17:54:06 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
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
|
3cca0df28e
|
Support getFormatedCustomerRef into contract list
|
2019-01-22 10:39:06 +01:00 |
|
Laurent Destailleur
|
8950720fb5
|
NEW Add getFormatedCustomerRef and getFormatedSupplierRef methods
|
2019-01-21 15:22:35 +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
|
2bbaae88d6
|
Fix standardize 'createfromclone' param when cloning
|
2019-01-19 12:46:38 +01:00 |
|
Philippe GRAND
|
43a2b5b1e2
|
update with html5 compliant code
|
2019-01-19 12:29:41 +01:00 |
|
Laurent Destailleur
|
5130019003
|
css
|
2019-01-17 19:27:26 +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 |
|
Ferran Marcet
|
555698a3af
|
Qual: Better management of select type of lines
|
2018-12-13 10:36:30 +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
|
602986ced8
|
Merge remote-tracking branch 'origin/7.0' into 7.0
# Conflicts:
# htdocs/comm/propal/class/propal.class.php
# htdocs/commande/class/commande.class.php
# htdocs/expensereport/class/expensereport.class.php
# htdocs/fourn/class/fournisseur.commande.class.php
|
2018-12-03 12:33:18 +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 |
|
Ferran Marcet
|
d8537a3c76
|
FIX Lines are not inserted correctly if VAT have code
|
2018-11-27 11:36:31 +01:00 |
|
Thibault Descamps
|
1cc130e5f6
|
NEW : conf to change concat desc order
|
2018-11-21 09:57:44 +01:00 |
|
Frédéric FRANCE
|
731d19a29b
|
add tooltip to butActionRefused
|
2018-11-13 21:40:17 +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
|
66ffcf287a
|
Fix filter on extrafields
|
2018-11-07 12:49:17 +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
|
bf2c521988
|
Fix warning
|
2018-11-05 09:55:00 +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 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Frédéric FRANCE
|
dbbcb6f8a1
|
code comment api contract
|
2018-10-26 22:30:48 +02:00 |
|
Frédéric FRANCE
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Frédéric FRANCE
|
fa78ab7c66
|
do not trim int
|
2018-10-16 23:20:13 +02:00 |
|
Maxime Kohlhaas
|
d4d921b1cc
|
Add massaction generate on main lists
|
2018-10-14 16:27:59 +02:00 |
|
Philippe GRAND
|
62c602e821
|
Standardize and update code
|
2018-10-10 08:50:23 +02:00 |
|
Laurent Destailleur
|
d776fc423e
|
Fix search criterai of contract
|
2018-10-08 00:52:21 +02:00 |
|
Laurent Destailleur
|
9f5e44c568
|
Fix search criterai of contract
|
2018-10-08 00:51:08 +02:00 |
|
Laurent Destailleur
|
6ed67ea77f
|
Clean code
|
2018-10-01 13:54:45 +02:00 |
|
Laurent Destailleur
|
adc36e7d63
|
Clean code
|
2018-10-01 00:20:47 +02: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
|
6b8baab7b4
|
Merge pull request #9535 from frederic34/patch-18
reduce complexity of contrat class
|
2018-09-18 15:04:48 +02:00 |
|
Laurent Destailleur
|
9415486059
|
Unique extrafields are reset when cloning contract
|
2018-09-16 22:13:29 +02:00 |
|
Frédéric FRANCE
|
122275f2a7
|
reduce complexity of contrat class
|
2018-09-16 18:58:59 +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
|
d9ffba72f0
|
Fix use fetch_object instead of fetch_array
|
2018-09-16 10:03:47 +02:00 |
|
Frédéric FRANCE
|
6744733730
|
add hook formconfirm to contractcard
|
2018-09-13 14:22:45 +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
|
f02b2f0239
|
Merge remote-tracking branch 'upstream/develop' into patch-6
|
2018-09-09 13:35:58 +02:00 |
|
Frédéric FRANCE
|
a3fa13994b
|
replace select_date
|
2018-09-09 09:36:12 +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
|
11d75573be
|
Standardize and update code
|
2018-09-05 12:21:13 +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
|
3de16a145e
|
Standardize and update code
|
2018-09-02 11:08:41 +02:00 |
|
Philippe GRAND
|
c4f05aff28
|
Standardize and update code
|
2018-09-02 10:42:31 +02:00 |
|
Frédéric FRANCE
|
3e723af018
|
start changing phpcs:ignore
|
2018-09-01 23:46:13 +02:00 |
|
Philippe GRAND
|
5d273960dc
|
fix conflict
|
2018-09-01 22:40:38 +02:00 |
|
Philippe GRAND
|
f77dd2ebc7
|
Standardize and update code
|
2018-09-01 15:13:59 +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
|
1944ef0dc3
|
conflict resolution
|
2018-09-01 12:38:22 +02:00 |
|
Laurent Destailleur
|
3b1cf41823
|
Fix eol
|
2018-09-01 12:17:52 +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 |
|
Philippe GRAND
|
3a8bde227b
|
Standardize and update code
|
2018-08-31 19:26:08 +02:00 |
|
Philippe GRAND
|
edaa575435
|
Standardize and update code
|
2018-08-31 18:36:15 +02:00 |
|
Frédéric FRANCE
|
b03f4004ea
|
PSR2 FunctionClosingBrace
|
2018-08-29 21:25:22 +02:00 |
|
Philippe GRAND
|
46b00705b3
|
Fix white spaces
|
2018-08-29 12:54:03 +02:00 |
|
Philippe Grand
|
65f9013634
|
Update api_contracts.class.php
|
2018-08-29 11:35:51 +02:00 |
|
Philippe GRAND
|
881ab54cf0
|
typo and translation
|
2018-08-29 11:06:20 +02:00 |
|
Philippe GRAND
|
8785c10ad8
|
typo
|
2018-08-29 10:52:27 +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
|
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
|
8cacda1c1e
|
Fix error message
|
2018-08-27 14:45:20 +02:00 |
|
Philippe GRAND
|
215677c972
|
Standardize and update code
|
2018-08-23 18:17:09 +02:00 |
|
Philippe GRAND
|
504b0e3d16
|
Update and standardize code
|
2018-08-22 18:34:50 +02:00 |
|
Philippe GRAND
|
0ffad50974
|
Update and standardize code
|
2018-08-22 11:24:31 +02:00 |
|
Frédéric FRANCE
|
6b6daf178f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-21 20:57:58 +02:00 |
|
Laurent Destailleur
|
0799970804
|
Merge pull request #9248 from frederic34/FunctionDeclaration
function declaration
|
2018-08-21 13:41:56 +02:00 |
|
Laurent Destailleur
|
4e02b134da
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2018-08-16 14:50:04 +02:00 |
|
Laurent Destailleur
|
7d6e25789c
|
Fix popup customer
|
2018-08-15 15:07:23 +02:00 |
|
Frédéric FRANCE
|
7bb781eea8
|
function declaration
|
2018-08-15 14:28:34 +02:00 |
|
Frédéric FRANCE
|
850ac34020
|
mark non camelCaps function
|
2018-08-13 17:26:32 +02:00 |
|
Laurent Destailleur
|
9fc5d39d07
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-12 20:09:36 +02:00 |
|
Laurent Destailleur
|
dc8c4402ee
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-12 20:09:22 +02:00 |
|
Laurent Destailleur
|
12e21b4886
|
FIX update extrafields
|
2018-08-12 16:29:26 +02:00 |
|
Frédéric FRANCE
|
62b83412ee
|
test phpcs v3
|
2018-08-09 11:31:48 +02:00 |
|
Philippe GRAND
|
948647f3f9
|
comment translation
|
2018-08-04 14:17:51 +02:00 |
|
Frédéric FRANCE
|
a0a5d33641
|
test include
|
2018-07-26 17:30:53 +02:00 |
|
Laurent Destailleur
|
982a1ffbaf
|
NEW Automatic position of scroll when creating an extrafield
|
2018-06-30 14:22:05 +02:00 |
|
Laurent Destailleur
|
f292c1c662
|
Option to solve autovalidation
|
2018-06-27 01:33:02 +02:00 |
|
Laurent Destailleur
|
a0e97c7640
|
Option to solve autovalidation
|
2018-06-27 01:31:53 +02:00 |
|
Laurent Destailleur
|
af9d2c3b5a
|
Merge pull request #9008 from grandoc/new_branch_22_06_2018
clean and update code
|
2018-06-24 13:47:26 +02:00 |
|
Laurent Destailleur
|
6dba88ab6e
|
Several fixes in look and feel
|
2018-06-23 14:23:07 +02:00 |
|
Laurent Destailleur
|
27a27e02a1
|
Fix css
|
2018-06-22 22:53:53 +02:00 |
|
Philippe GRAND
|
afda5288a8
|
clean and update code
|
2018-06-22 16:27:11 +02:00 |
|
Laurent Destailleur
|
81497687e9
|
Fix missing oldcopy in trigger call
|
2018-06-22 10:55:36 +02:00 |
|
Laurent Destailleur
|
1a8afeff2a
|
Fix error message
|
2018-06-20 23:50:50 +02:00 |
|
Laurent Destailleur
|
ca5f27636b
|
Merge pull request #8978 from grandoc/new_branch_17_06_2018
clean and update code
|
2018-06-18 11:16:00 +02:00 |
|
Philippe GRAND
|
ddbf5e59e1
|
clean and update code
|
2018-06-18 10:12:19 +02:00 |
|
Inovea Conseil
|
d5a3e63e05
|
Fix missing paramater for generateDocument
|
2018-06-15 09:47:28 +02:00 |
|
Laurent Destailleur
|
758e5a51a5
|
Fix contextpage was not saved in forms
|
2018-06-08 19:35:53 +02:00 |
|
Laurent Destailleur
|
eb9321f2b8
|
css
|
2018-06-08 17:53:13 +02:00 |
|
Laurent Destailleur
|
034ce7e55d
|
CSS
|
2018-06-02 10:36:22 +02:00 |
|
Laurent Destailleur
|
7c0afbe025
|
Clean code
|
2018-05-31 17:12:08 +02:00 |
|
Frédéric FRANCE
|
30a3b95368
|
loadlangs
|
2018-05-26 20:32:23 +02:00 |
|
atm-quentin
|
8cd6c72a2f
|
NEW advanced rights
|
2018-05-07 10:04:43 +02:00 |
|
atm-quentin
|
ec5e84075e
|
NEW Rights to ignore price min
|
2018-05-03 10:18:38 +02:00 |
|