Maxime Kohlhaas
|
4bd806ea65
|
Move $selectedlines to parameter
|
2019-08-27 14:33:28 +02:00 |
|
Laurent Destailleur
|
3eb32360ce
|
Fix escape
|
2019-08-27 14:10:23 +02:00 |
|
Laurent Destailleur
|
9e04eccf54
|
Fix syntax error
|
2019-08-26 23:28:06 +02:00 |
|
Frans Bosman
|
23311abd6a
|
Update card.php
|
2019-08-25 19:57:49 +02:00 |
|
Frans Bosman
|
a822a34a51
|
Update card.php
|
2019-08-25 19:54:42 +02:00 |
|
Frans Bosman
|
e15d91640b
|
Update card.php
|
2019-08-22 09:43:04 +02:00 |
|
Laurent Destailleur
|
3f105a97bf
|
Debug the new workboard
|
2019-08-18 04:56:48 +02:00 |
|
Laurent Destailleur
|
5351d78a96
|
Merge branch 'develop' into develop_new_dashboard
|
2019-08-18 01:26:56 +02:00 |
|
Regis Houssin
|
7c8b3c9a38
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-08-13 07:34:02 +02:00 |
|
Laurent Destailleur
|
ee37cbd412
|
Merge pull request #11638 from ptibogxiv/patch-212
NEW list by date_cloture on order list
|
2019-08-10 01:06:16 +02:00 |
|
Laurent Destailleur
|
14fabeb377
|
Variable rangtouse -> ranktouse
|
2019-08-10 00:46:20 +02:00 |
|
ptibogxiv
|
0cbb144628
|
Update list.php
sometimes we need to get last update or closed order
|
2019-08-05 20:52:27 +02:00 |
|
ptibogxiv
|
f417c85186
|
NEW list by date_cloture on order list
|
2019-08-05 20:49:41 +02:00 |
|
John Botella
|
b4c4e5a662
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard
|
2019-08-02 14:52:01 +02:00 |
|
Laurent Destailleur
|
d7a41c6b72
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/admin.lang
|
2019-08-01 12:54:27 +02:00 |
|
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 |
|
Regis Houssin
|
d9ea61e47c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop_menu
Conflicts:
htdocs/commande/class/commande.class.php
|
2019-07-31 12:49:56 +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 |
|
Maxime Kohlhaas
|
5c2763d0dd
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_choose_lines_from_origin
|
2019-07-27 10:53:43 +02:00 |
|
Laurent Destailleur
|
865ebb9de2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/ticket/class/ticket.class.php
|
2019-07-20 13:29:10 +02:00 |
|
Laurent Destailleur
|
e5c3945ec3
|
FIX delete of links between objects
|
2019-07-19 18:10:45 +02:00 |
|
Laurent Destailleur
|
361fc53685
|
FIX div not balanced
|
2019-07-19 17:47:54 +02:00 |
|
Regis Houssin
|
cbda42d146
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-07-19 09:37:34 +02:00 |
|
Laurent Destailleur
|
50480bf517
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/opensurvey/index.php
|
2019-07-18 18:23:24 +02:00 |
|
Laurent Destailleur
|
f44182c89f
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-07-16 00:13:52 +02:00 |
|
Regis Houssin
|
294bc5dcb5
|
FIX avoid conflict with "$classname" in card.php
|
2019-07-15 10:19:06 +02:00 |
|
Maxime Kohlhaas
|
9c47cb6f91
|
NEW : can choose lines while creating order from origin
|
2019-07-08 23:16:32 +02:00 |
|
Laurent Destailleur
|
0a7d70829f
|
Translation of some comments
|
2019-07-05 21:37:25 +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 |
|
ptibogxiv
|
174e531d69
|
Update commande.class.php
|
2019-06-25 18:12:16 +02:00 |
|
ptibogxiv
|
9e88bf1f1c
|
NEW multilangs in fetch_lines
|
2019-06-25 15:41:20 +02:00 |
|
Laurent Destailleur
|
fa476b4994
|
Properties ->libelle_incoterms were renamed into ->label_incoterms
|
2019-06-25 13:00:02 +02:00 |
|
Laurent Destailleur
|
5675e7c50e
|
Clean code of deprecated method
|
2019-06-22 18:19:40 +02:00 |
|
Nicolas ZABOURI
|
2e4db8c83c
|
Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook
|
2019-06-19 08:39:05 +02:00 |
|
ICstage
|
820c420ae5
|
FIX Missing hooks
|
2019-06-18 14:07:52 +02:00 |
|
Laurent Destailleur
|
a74eaaff4d
|
Fix sort of linked elements
|
2019-06-17 15:54:54 +02:00 |
|
Regis Houssin
|
6597c9f60d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-06-17 06:45:08 +02:00 |
|
ptibogxiv
|
651f4158ac
|
Fix add / delete contact access
|
2019-06-16 14:18:26 +02:00 |
|
ptibogxiv
|
70d9d3ab4c
|
FIX contact default list with adding job/function
as my last commit it's same contact but différent job / function. More clear for choosing right contact in the list (PR from my dolibarr's customer)
|
2019-06-04 18:23:25 +02:00 |
|
Regis Houssin
|
38246b4088
|
NEW add new function "setEntity()"
|
2019-06-03 11:13:26 +02:00 |
|
Regis Houssin
|
7b8b1a9052
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-06-03 11:04:28 +02:00 |
|
Laurent Destailleur
|
2218994958
|
FIX Duplicate encoding on error message
|
2019-05-29 09:51:45 +02:00 |
|
Lionel VESSILLER
|
1c1b3c376e
|
Fix check if order line is not in a shipment line before deleting
|
2019-05-23 15:57:02 +02:00 |
|
Regis Houssin
|
4f2f23f522
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-05-22 08:45:31 +02:00 |
|
Laurent Destailleur
|
22e897b1a1
|
Clean and prepare code to fix a SQL injection
|
2019-05-21 17:22:38 +02:00 |
|
Regis Houssin
|
2cf630c213
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu
|
2019-05-20 16:10: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 |
|
florian HENRY
|
02af7ca25e
|
fix pb with multicompny payment dictionnary on faxcture card
|
2019-05-18 12:11:28 +02:00 |
|
Francis Appels
|
a2d4a59321
|
Merge branch 'develop' into clean_10_beta
|
2019-05-13 21:27:13 +02:00 |
|
Laurent Destailleur
|
5876582030
|
Fix responsive
|
2019-05-12 15:56:29 +02:00 |
|
Regis Houssin
|
b73df2698d
|
FIX better compatibility with Multicompany
|
2019-05-12 14:25:41 +02:00 |
|
Laurent Destailleur
|
3def11d5c9
|
Standardize translation
|
2019-05-10 19:32:46 +02:00 |
|
Laurent Destailleur
|
9de0e69456
|
FIX column project into list
|
2019-05-10 15:11:06 +02:00 |
|
Laurent Destailleur
|
5625c94c44
|
Fix missing label on project tooltip
|
2019-05-10 14:40:15 +02:00 |
|
Laurent Destailleur
|
0e8184332e
|
Fix missing label on project tooltip
|
2019-05-10 14:39:05 +02:00 |
|
Laurent Destailleur
|
a94c291b76
|
Dolibarization
|
2019-05-09 16:59:06 +02:00 |
|
Francis Appels
|
18c5c586ab
|
Cleanup set_draft in syslog
|
2019-05-01 09:38:27 +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
|
f45462b409
|
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
|
2019-04-17 10:39:49 +02:00 |
|
Laurent Destailleur
|
e6ffaeefe5
|
CSS
|
2019-04-17 10:39:30 +02:00 |
|
ATM john
|
292d9c38a5
|
Appli function to links
|
2019-04-15 00:21:58 +02:00 |
|
Francis Appels
|
d08db86ba1
|
Fix customer order updateline
|
2019-04-11 18:55:16 +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
|
917b9d69fa
|
Removed the method 4 of GETPOST (to get $_COOKIE). It was not used and
not recommanded to use in Dolibarr.
|
2019-04-08 14:55:31 +02:00 |
|
Laurent Destailleur
|
31963be6a0
|
Merge pull request #10922 from altatof/cloneorder
clone of order like in propal (ref_client, contacts)
|
2019-03-31 18:25:48 +02:00 |
|
Laurent Destailleur
|
361254a4c0
|
Fix regression after renamind valdate_invoices
|
2019-03-31 18:23:54 +02:00 |
|
Laurent Destailleur
|
1b2826f476
|
Look and feel v10
|
2019-03-29 13:26:26 +01:00 |
|
Christophe Battarel
|
c9b321ded4
|
add global conf to createfromclone
|
2019-03-27 10:32:40 +01:00 |
|
Christophe Battarel
|
f1548bd253
|
fix objfrom
|
2019-03-27 10:27:08 +01:00 |
|
Christophe Battarel
|
9efb1b9525
|
copy internal and external contacts when cloning like in propal
|
2019-03-27 10:09:45 +01:00 |
|
Christophe Battarel
|
1b9cdd021a
|
test constant for keeping customer ref on clone of order like in propal
|
2019-03-27 10:00:29 +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
|
f27f65e8bf
|
Responsive
|
2019-03-25 10:09:02 +01:00 |
|
Ion
|
7bfa49b29c
|
FIX: Disallow line start date > end date
|
2019-03-24 14:30:00 +01:00 |
|
Laurent Destailleur
|
20f3af066c
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/tva/clients.php
|
2019-03-23 22:44:14 +01:00 |
|
Laurent Destailleur
|
5666fbedac
|
FIX If we build one invoice for several orders, we must put the ref of
order on the line to not lose information.
|
2019-03-23 22:30:52 +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 |
|
Laurent Destailleur
|
a7181750c6
|
Merge pull request #10879 from altatof/noconcatdesc
NEW : add constant NO_CONCAT_DESCRIPTION
|
2019-03-22 12:56:46 +01:00 |
|
Philippe GRAND
|
b8d04fa076
|
translation
|
2019-03-22 09:43:12 +01:00 |
|
Laurent Destailleur
|
930720decd
|
WIP Start to replace use of property ->brouillon
|
2019-03-21 18:13:51 +01:00 |
|
Laurent Destailleur
|
90df30e412
|
NEW Add trigget FICHINTER_UNVALIDATE
Standardize code of setDraft.
|
2019-03-21 17:37:56 +01:00 |
|
Laurent Destailleur
|
5d21547854
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/product/price.php
htdocs/user/perms.php
|
2019-03-21 12:20:24 +01:00 |
|
Laurent Destailleur
|
41c737a213
|
Fix, Oops, test was inverted
|
2019-03-18 20:16:19 +01:00 |
|
Laurent Destailleur
|
aa013ff753
|
Fix do we really must copy notes when creating an object from another
source object? Add a hack with hidden option to be able to change this.
|
2019-03-18 20:09:09 +01:00 |
|
Christophe Battarel
|
8b3fd2eacf
|
NEW : add constant NO_CONCAT_DESCRIPTION
|
2019-03-18 16:10:17 +01:00 |
|
Philippe GRAND
|
c13a1dbc63
|
translation
|
2019-03-18 13:45:24 +01:00 |
|
Laurent Destailleur
|
7cdfff7263
|
Fix syntax error
|
2019-03-15 20:42:49 +01:00 |
|
Laurent Destailleur
|
c0b6699b25
|
All methods set_draft() were renamed into setDraft()
|
2019-03-15 19:01:40 +01:00 |
|
Laurent Destailleur
|
a2d6723ff3
|
WIP Link files to expense report lines
|
2019-03-15 15:07:52 +01:00 |
|
Laurent Destailleur
|
cdf6e4b65a
|
Fix some PSR rules
|
2019-03-14 16:43:27 +01:00 |
|
Laurent Destailleur
|
eeafc3c630
|
Standardize translation of amount
|
2019-03-13 14:10:36 +01:00 |
|
Laurent Destailleur
|
98ca9bf17a
|
Reduce quantity of string to translates
|
2019-03-12 19:44:59 +01:00 |
|
Joan Louis
|
f326c75be7
|
Update call to extrafields from cards
|
2019-03-11 21:34:16 +01:00 |
|
Laurent Destailleur
|
e913f1919f
|
Merge pull request #10803 from joanlouis/fix-extrafields-calls-from-cards
Update call to extrafields from cards
|
2019-03-11 21:14:53 +01:00 |
|
Joan Louis
|
ee5753819e
|
Update call to extrafields from cards
|
2019-03-11 14:22:04 +01:00 |
|
John BOTELLA
|
97544e0aea
|
add new dolGetStatus to LibStatut in common invoice class
|
2019-03-07 15:24:11 +01:00 |
|
John BOTELLA
|
ca10b1e403
|
add new dolGetStatus to LibStatut in product class
|
2019-03-07 11:37:54 +01:00 |
|
John BOTELLA
|
5ea5d51247
|
Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status
|
2019-03-07 09:41:03 +01:00 |
|
Laurent Destailleur
|
401ad65975
|
Fix API explorer was broken due to corrupted API
|
2019-03-06 18:04:36 +01:00 |
|
John BOTELLA
|
5fd3a253ab
|
add new dolGetStatus to LibStatut in order class
|
2019-03-06 14:19:40 +01:00 |
|
Frédéric FRANCE
|
f283782445
|
change visibility
|
2019-03-04 19:57:46 +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
|
796ea6f4ea
|
add visibility
|
2019-02-28 23:19:58 +01:00 |
|
Frédéric FRANCE
|
7e31ca48d8
|
add visibility
|
2019-02-28 22:07:48 +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
|
42a1387218
|
wip
|
2019-02-25 00:56:48 +01:00 |
|
ptibogxiv
|
25d4be0772
|
Update commande.class.php
|
2019-02-20 12:29:47 +01:00 |
|
Frédéric FRANCE
|
2ede3c1a40
|
Update list.php
|
2019-02-14 19:04:07 +01:00 |
|
ptibogxiv
|
58a73e7b4c
|
Update api_orders.class.php
|
2019-02-14 00:42:00 +01:00 |
|
ptibogxiv
|
7ac47fabda
|
NEW link/delete contact in order object
|
2019-02-14 00:36:35 +01:00 |
|
Laurent Destailleur
|
a39b4bcb7d
|
Update api_orders.class.php
|
2019-02-13 16:39:45 +01:00 |
|
Jimmy L
|
a172ea00a4
|
Rest API: Proposal, Orders, Invoices: Add contact details
|
2019-02-12 17:54:59 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Philippe GRAND
|
71e99e0972
|
update with html5 compliant code
|
2019-02-04 10:42:40 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +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
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +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
|
496fa9b0fb
|
PSR2.Files.EndFileNewline.TooMany
|
2019-01-27 14:10:35 +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 |
|
Philippe GRAND
|
540e6d6f79
|
update with html5 compliant code
|
2019-01-23 17:34:30 +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
|
336be085f6
|
update with html5 compliant code
|
2019-01-19 12:28:18 +01:00 |
|
Laurent Destailleur
|
5130019003
|
css
|
2019-01-17 19:27:26 +01:00 |
|
Philippe GRAND
|
1a55d5fe85
|
update with html5 compliant code
|
2019-01-17 14:27:07 +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 |
|
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
|
9fb672d51b
|
Merge pull request #10127 from atm-florian/develop_scrunitizer
fix scrunitizer
|
2018-12-14 17:28:34 +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
|
f97b561af0
|
Merge branch 'develop' into qual_rename_facnumber
|
2018-12-13 20:24:12 +01:00 |
|