lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
102,103 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-2
Commit Graph

11122 Commits

Author SHA1 Message Date
Laurent Destailleur
d80f23589d Fix missing entry 2021-02-10 02:39:58 +01:00
Laurent Destailleur
1c99eaedbc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-09 14:00:11 +01:00
Laurent Destailleur
4a97690f78 Add a check on syntax of hostname for email colector 2021-02-09 13:59:00 +01:00
Laurent Destailleur
3d892bd60b
Merge pull request #15735 from FHenry/dev_new_project_task_add_contact 
NEW: When add contact/user to Project, ask to also affect on Tasks
 2021-02-09 13:43:08 +01:00
Gauthier PC portable 024
d106fe7e90 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-09 09:50:46 +01:00
Gauthier PC portable 024
41af1a59f4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-08 10:37:01 +01:00
Gauthier PC portable 024
e2a73e6c88 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-02-08 09:46:48 +01:00
Alexandre SPANGARO
b8ea96ba57 Fix module asset in development 2021-02-08 05:39:07 +01:00
Laurent Destailleur
fd3354142b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
 2021-02-06 01:17:05 +01:00
Laurent Destailleur
c6badeed57 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/compta/prelevement/card.php
 2021-02-06 01:14:48 +01:00
Laurent Destailleur
4428e2b18e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/product/price.php
 2021-02-06 01:08:37 +01:00
Laurent Destailleur
87c8d917e9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/prelevement/card.php
 2021-02-06 01:03:31 +01:00
Laurent Destailleur
9843e79bac Trans 2021-02-05 15:43:03 +01:00
Gauthier PC portable 024
d93c71a42f Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 12:28:15 +01:00
Gauthier PC portable 024
e6bea60409 FIX : bank_url 2021-02-05 12:27:14 +01:00
Florian Mortgat
3f862bf43e FIX 10.0 - before crediting a withdrawal receipt, check whether it has been credited already 2021-02-05 11:34:39 +01:00
Gauthier PC portable 024
df8ca1ef84 Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries 2021-02-05 09:29:20 +01:00
Laurent Destailleur
49470ea216 Trans 2021-02-05 00:56:44 +01:00
Gauthier PC portable 024
e188ec6cd7 NEW : add real payments on salaries objects 2021-02-04 17:21:08 +01:00
Laurent Destailleur
eee49b9132 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/delais.php
 2021-02-04 13:50:07 +01:00
Laurent Destailleur
eca010937f FIX Trigger on expense report was not fired 
FIX Bad dates on info tabs
 2021-02-04 11:56:53 +01:00
Laurent Destailleur
369a835abb
Merge pull request #16151 from bb2a/mass_action_propal_nosigned 
NEW: add massActions to set a commercial proposal to status "Refused"
 2021-02-03 20:36:10 +01:00
Anthony Berton
eb15c4d800 20200203 2021-02-03 11:29:54 +01:00
Laurent Destailleur
4d029194d3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
 2021-02-02 13:22:23 +01:00
Laurent Destailleur
f4f9a7c461 Clean page of info tools 2021-02-02 09:44:51 +01:00
Gauthier PC portable 024
1eb4968a29 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-02-01 12:00:04 +01:00
Laurent Destailleur
b349290cd1 Fix test for date in future 2021-01-31 12:57:54 +01:00
Laurent Destailleur
b24aac1e6b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
 2021-01-31 12:03:39 +01:00
Laurent Destailleur
215e36bb2e Fix typo 2021-01-29 11:19:33 +01:00
Laurent Destailleur
ce3279c462 NEW Add function showValueWithCopyAndPasteButton() to add a copy/paste 
button on a text.
 2021-01-28 12:34:54 +01:00
Laurent Destailleur
4fbf2fff6f
Merge pull request #16034 from Hystepik/develop#2 
Close #16027 New Feature copy Code Client
 2021-01-28 11:17:10 +01:00
Gauthier PC portable 024
8a5588e518 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects 2021-01-28 10:28:36 +01:00
Laurent Destailleur
a4c0459c1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/list.php
 2021-01-27 21:09:01 +01:00
Frédéric FRANCE
7cd698aff9
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-26 20:19:49 +01:00
Laurent Destailleur
19dd36aa59 Trans 2021-01-26 11:45:29 +01:00
Laurent Destailleur
6313fb8be0 Fix lang 2021-01-26 11:38:07 +01:00
Laurent Destailleur
c417f730b9 Clean language file 2021-01-26 11:31:48 +01:00
Alexandre SPANGARO
94d4f2da8e Missing language key & error translation 2021-01-26 05:14:01 +01:00
Laurent Destailleur
b4be97ec15 Draft code 2021-01-25 18:59:04 +01:00
Laurent Destailleur
21dccadb3a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/banks.lang
	htdocs/stripe/class/stripe.class.php
 2021-01-24 15:32:39 +01:00
Laurent Destailleur
0f5fc7353e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/admin/mailing.php
	htdocs/admin/paymentbybanktransfer.php
	htdocs/admin/prelevement.php
	htdocs/modulebuilder/template/admin/setup.php
 2021-01-24 15:29:53 +01:00
Laurent Destailleur
7365974594 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/langs/en_US/banks.lang
	htdocs/stripe/class/stripe.class.php
 2021-01-24 15:24:56 +01:00
Laurent Destailleur
b4783f69d6 Show if permission is an advanced permission 2021-01-23 18:13:50 +01:00
Laurent Destailleur
f7e637a552 Trans 2021-01-23 17:40:14 +01:00
Laurent Destailleur
2acf2353a3 Fix bad link 2021-01-23 12:16:25 +01:00
Laurent Destailleur
599d69b07c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-22 13:40:08 +01:00
Laurent Destailleur
e1b6f33894 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/class/contact.class.php
	htdocs/langs/fr_FR/stocks.lang
	htdocs/modulebuilder/template/myobject_list.php
 2021-01-22 13:40:00 +01:00
Laurent Destailleur
79fb672674 Sync transifex 2021-01-22 01:47:29 +01:00
Laurent Destailleur
8e5b971c49
Merge pull request #15918 from zuiko/patch-1 
Fix #15633: Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function.
 2021-01-21 13:33:47 +01:00
lmarcouiller
b2809e4ee2 add trans to copied to clipboard text 2021-01-21 09:54:26 +01:00
Laurent Destailleur
79308b332b Trans 2021-01-20 11:41:17 +01:00
Frédéric FRANCE
e8c4db2188
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-19 11:36:59 +01:00
Laurent Destailleur
2c6d11e040 When creating invoice by mass action, message has link to invoice 2021-01-19 10:42:43 +01:00
Gauthier PC portable 024
e2abbbcece Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects 2021-01-19 08:57:24 +01:00
Gauthier PC portable 024
2cfaf5fbd6 NEW : add real payments on vat objects 2021-01-18 17:08:17 +01:00
Laurent Destailleur
f95bf56c15 Fix translation 2021-01-18 15:24:50 +01:00
Frédéric FRANCE
c8d1410e33
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-16 21:06:12 +01:00
Laurent Destailleur
87d16c56e7
Merge pull request #15977 from frederic34/TotalAmountOfdirectDebitOrderDiffersFromSumOfLines 
add missing translation
 2021-01-16 17:28:20 +01:00
Laurent Destailleur
d592a5d669 Trans 2021-01-16 16:47:38 +01:00
Laurent Destailleur
04e669ec96 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/langs/fr_FR/other.lang
 2021-01-16 15:38:34 +01:00
Laurent Destailleur
064b00e979 Sync transifex 2021-01-16 15:33:47 +01:00
Frédéric FRANCE
871f762546
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-16 13:58:27 +01:00
Laurent Destailleur
ba37396af2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-15 14:36:32 +01:00
Laurent Destailleur
e8ed6a9f09 Trans 2021-01-15 14:33:26 +01:00
Laurent Destailleur
828f1c8314 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
 2021-01-15 14:04:22 +01:00
Laurent Destailleur
c3046326cb Fix help 2021-01-15 12:42:40 +01:00
Laurent Destailleur
16d98d2691 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/projet/graph_opportunities.inc.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 14:09:09 +01:00
Laurent Destailleur
768d2db8a1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/projet/graph_opportunities.inc.php
	htdocs/user/class/usergroup.class.php
 2021-01-14 13:43:48 +01:00
Laurent Destailleur
ea47a55144 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-14 12:59:27 +01:00
Laurent Destailleur
1cf86931b3 Fix graph of opportunity when a status has been removed. 2021-01-14 12:58:50 +01:00
Frédéric FRANCE
271378fb87
add translation 2021-01-13 18:09:57 +01:00
Frédéric FRANCE
a5678147dd
add missing translation 2021-01-13 16:52:32 +01:00
Laurent Destailleur
b7402ecf3f
Merge branch 'develop' into NEW_product_customer_price_ref 2021-01-13 13:38:19 +01:00
Frédéric FRANCE
e2c57584b7
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-12 23:47:24 +01:00
Marc de Lima Lucio
82b0f18378 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref 2021-01-12 15:10:15 +01:00
Laurent Destailleur
c2187b2ff1
Merge branch 'develop' into develop_new_workstation 2021-01-11 17:59:13 +01:00
Laurent Destailleur
cae9dc3acf
Merge pull request #15925 from FHenry/dev_add_tag_contact_thirdpartycontactcreateion 
NEW : Add contact tag and bulk email status on thirparty+contact create form
 2021-01-11 17:28:12 +01:00
Laurent Destailleur
df3034d13a
Merge branch 'develop' into patch-1 2021-01-11 17:15:46 +01:00
Laurent Destailleur
8a3a59dfca
Merge pull request #15636 from aspangaro/14a5 
NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty
 2021-01-11 17:10:03 +01:00
atm-lena
f17474a8de 12.0 FIX Translation Permission777 FR 2021-01-11 16:56:19 +01:00
Laurent Destailleur
307d718e82
Merge pull request #15931 from ATM-Nicolas/new_shipping_workflow 
NEW : Workflow to set a shipment as closed
 2021-01-11 16:34:26 +01:00
Gauthier PC portable 024
8dfb088fc5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_workstation 2021-01-11 10:34:38 +01:00
Anthony Berton
d3fa8b9f20 20210110 2021-01-10 01:07:27 +01:00
Laurent Destailleur
f411b29b28 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/accountancy.lang
 2021-01-09 02:34:43 +01:00
ATM-Nicolas
5a6e4f54f0 NEW : Workflow to set a shipment as closed 2021-01-08 16:25:54 +01:00
Laurent Destailleur
69c614ec2a Sync transifex 2021-01-08 11:22:11 +01:00
Alexandre SPANGARO
9fa23dea49 Add missing language key 2021-01-07 17:39:38 +01:00
Florian HENRY
8adfe54949 bulk email management 2021-01-07 17:33:57 +01:00
Laurent Destailleur
6da3ed1a51 Merge 2 exclusive options into 1 2021-01-07 12:39:51 +01:00
Laurent Destailleur
26fa8b45ac
Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product 
NEW: preload product description on selection for customer propal/order/invoice
 2021-01-07 11:19:53 +01:00
Laurent Destailleur
55b46ca149
Merge pull request #15318 from bafbes/abb120353 
New: add notification on ACTION_CREATE event
 2021-01-07 11:17:33 +01:00
Alexandre SPANGARO
4077565de9 Merge branch '13.0' into 13b5 2021-01-07 05:27:43 +01:00
zuiko
2300c040b3
Update admin.lang 2021-01-06 23:40:27 +01:00
zuiko
e861248af8
Update admin.lang 
Fix #15633
 2021-01-06 23:37:58 +01:00
Frédéric FRANCE
1e8362575a
Merge remote-tracking branch 'upstream/develop' into boxindex 2021-01-06 21:05:59 +01:00
Norbert Penel
361d2352a5
German date format 
fixed by my client, they use a dot in this case : 
https://www.wikihow.com/Write-German-Dates
 2021-01-06 12:12:14 +01:00
Laurent Destailleur
ba68c958e1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 19:12:57 +01:00
Marc de Lima Lucio
f03f5701f6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref 2021-01-05 16:01:31 +01:00
Laurent Destailleur
4b45c5e723 Trans 2021-01-05 12:29:13 +01:00
Florian HENRY
dfaf77b03f merge develop 2021-01-03 15:14:34 +01:00
Alexandre SPANGARO
e18bdfd9f0 Add missing language key 2021-01-03 15:01:15 +01:00
Alexandre SPANGARO
99949c4817 Merge remote-tracking branch 'upstream/develop' into 14a5 2021-01-03 11:46:20 +01:00
Frédéric FRANCE
bd762bc58f
boxes 2021-01-02 21:50:58 +01:00
Laurent Destailleur
7f0f72ca47 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:18 +01:00
Laurent Destailleur
1ab459e854 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:08 +01:00
Alexandre SPANGARO
2727fd70b7 FIX: Accountancy - Debug experimental function to validate movements 2021-01-02 14:00:24 +01:00
Frédéric FRANCE
b71e837ddd
clean code 2021-01-02 10:18:58 +01:00
Frédéric FRANCE
2894dac221
clean code 2021-01-02 10:17:11 +01:00
Laurent Destailleur
dbbd5e1abe Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-01 22:00:17 +01:00
Laurent Destailleur
a8cd62c44e Add AUDIT_ENABLE_PREFIX_SESSION 2021-01-01 22:00:00 +01:00
Laurent Destailleur
b88ee6eff4
Merge pull request #15815 from FHenry/dev_add_tag_on_massaction 
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
 2021-01-01 21:36:15 +01:00
Laurent Destailleur
71e4a672f5
Merge branch 'develop' into develop_patch-1 2021-01-01 20:52:43 +01:00
Laurent Destailleur
020caf8809 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-30 23:52:36 +01:00
Laurent Destailleur
ab54d30b57 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
 2020-12-30 21:48:44 +01:00
Laurent Destailleur
79da047802 FIX Dates of sales start in TakePOS 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
 2020-12-30 21:46:40 +01:00
Laurent Destailleur
6ef7d3db79 FIX Dates of sales start in TakePOS 2020-12-30 21:43:04 +01:00
Laurent Destailleur
92a88441ac
Merge pull request #15328 from FHenry/dev_multifilter_jounal_on_bookeping 
Dev multifilter jounal on bookeping
 2020-12-30 13:19:27 +01:00
Laurent Destailleur
b6e33771be
Update accountancy.lang 2020-12-30 13:19:15 +01:00
Laurent Destailleur
744bc56953
Merge pull request #15283 from prietojc/12.0.3 
NEW massaction for Bank Transfer
 2020-12-30 13:11:31 +01:00
Laurent Destailleur
17b68a30d7
Merge branch 'develop' into dev_add_tag_on_massaction 2020-12-30 13:10:02 +01:00
Laurent Destailleur
057ed201a7 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
 2020-12-30 12:08:12 +01:00
Florian HENRY
806b40662f merge develop 2020-12-28 21:15:25 +01:00
Alexandre SPANGARO
9eaeab1208 Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-28 03:30:41 +01:00
Laurent Destailleur
199b46cfaf Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/langs/en_US/modulebuilder.lang
 2020-12-27 16:53:15 +01:00
Laurent Destailleur
5fc3a9ce7d Debug v13 2020-12-27 15:39:10 +01:00
Laurent Destailleur
28642238de Fix error message 2020-12-27 15:09:27 +01:00
Maxime Kohlhaas
11146a0b66 Add contact tab in default generated php files 2020-12-25 11:52:34 +01:00
Florian HENRY
5ae5f3e7ac let societe project acctioncomme website accounr 2020-12-24 00:32:54 +01:00
Florian HENRY
720539ff46 on goung 2020-12-23 23:52:43 +01:00
Florian HENRY
26d3ea2227 on going 2020-12-23 23:32:50 +01:00
Laurent Destailleur
f8e4985de1 Trans 2020-12-23 22:30:29 +01:00
Laurent Destailleur
6fad9c2d3b Fix edition of operation into email collector 2020-12-22 16:59:59 +01:00
Laurent Destailleur
ef2bd563e2 trans 2020-12-22 16:55:51 +01:00
Laurent Destailleur
0068c1fb78 Trans 2020-12-22 16:29:53 +01:00
Laurent Destailleur
5252aa42b2 Trans 2020-12-21 18:20:13 +01:00
Gauthier PC portable 024
7b739920a2 NEW : Workstations management 2020-12-21 12:28:45 +01:00
Laurent Destailleur
157e94a664 Fix trans 2020-12-19 16:50:31 +01:00
Laurent Destailleur
fe93ee4d08 Debug website module for multilanguage 2020-12-19 13:03:40 +01:00
Laurent Destailleur
0eaf924d3b Add warning on non https website to axplain why features is broken 2020-12-18 15:08:00 +01:00
Laurent Destailleur
90d8299c92 Fix purge tool 2020-12-18 13:24:02 +01:00
Laurent Destailleur
b0d524beed Debug v13 2020-12-17 11:57:12 +01:00
Laurent Destailleur
edb02ef05a Fix ticket 2020-12-16 19:03:19 +01:00
Laurent Destailleur
e7dda7bb4f Move help into tooltip help section 2020-12-16 15:46:54 +01:00
Laurent Destailleur
93b9061a71
Merge pull request #15698 from StephaneLesage/export-categories 
FIX: missing imports/exports of categories
 2020-12-16 15:30:00 +01:00
Laurent Destailleur
1d6e2a01a6
Merge pull request #15762 from aspangaro/13b1 
FIX: Accountancy - Quadra export format - Manage negative amount
 2020-12-16 15:24:14 +01:00
Alexandre SPANGARO
ca40d5e52a NEW: Accountancy - Introduce FEC "2" Format to resolve conflict with some software 2020-12-16 05:16:08 +01:00
Alexandre SPANGARO
ca6b8176e9 Merge remote-tracking branch 'upstream/develop' into 13b1 2020-12-16 04:32:26 +01:00
Stephane Lesage
7853e77d3f Export/Import categories missing fields and clean 2020-12-15 19:53:47 +01:00
Laurent Destailleur
37fe5bb3ef Solve blocking feature. Can increase stock of a Kit without changing 
subproduct stock.
 2020-12-15 15:18:01 +01:00
Laurent Destailleur
1f6f4742d5 Trans 2020-12-15 14:01:25 +01:00
Laurent Destailleur
cee63335a2 FIX #15754 Mor complete PR 2020-12-15 13:38:21 +01:00
Laurent Destailleur
a2bd920371 Fix translation of units 2020-12-15 11:39:18 +01:00
Laurent Destailleur
2ae1aac5a4 Fix setup 2020-12-15 11:18:29 +01:00
Laurent Destailleur
31693eed21 Fix setup was not clear 2020-12-15 11:10:35 +01:00
Alexandre SPANGARO
5ec7b01fb4 FIX: Link to subaccount ledger 2020-12-15 09:34:46 +01:00
Alexandre SPANGARO
31e5709e0b Revert "FIX: Link to subaccount ledger" 
This reverts commit 64fa2120b2.
 2020-12-15 09:32:54 +01:00
Alexandre SPANGARO
64fa2120b2 FIX: Link to subaccount ledger 2020-12-15 08:40:14 +01:00
Alexandre SPANGARO
593f5bcb7a Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-15 06:50:22 +01:00
Laurent Destailleur
d9886044a6 Trans 2020-12-14 15:10:31 +01:00
Laurent Destailleur
acb73966f7 Clean code. Removed phpexcel library. 2020-12-13 16:27:44 +01:00
Laurent Destailleur
a5d2e04dea Debug v13 2020-12-12 19:09:07 +01:00
Laurent Destailleur
33bb1919f0
Merge branch 'develop' into develop#3 2020-12-12 12:23:33 +01:00
Florian HENRY
0ed084d585 NEW: When add contact/user to Project, ask to also affect on project task 2020-12-11 17:38:38 +01:00
Laurent Destailleur
18efbebd02 css 2020-12-11 17:11:50 +01:00
lmarcouiller
dea75e6158 Close #15729 : fix error on box name and format 2020-12-11 15:55:17 +01:00
lmarcouiller
a5cf177025 Close #15729 : first push 2020-12-11 15:22:29 +01:00
Laurent Destailleur
2adbd29b49 Debug generation of doc from modulebuilder 2020-12-11 14:22:36 +01:00
Laurent Destailleur
cfa194436f Debug v13 2020-12-11 00:55:21 +01:00
Laurent Destailleur
693a7590ef Fix boxes 2020-12-10 17:09:25 +01:00
Laurent Destailleur
c850f4c918 Fix fatal error 2020-12-10 16:01:06 +01:00
Stephane Lesage
bcf4f65cc9 Fix & sync import/export entity icons/labels translation 2020-12-10 14:15:33 +01:00
Laurent Destailleur
dac0267a38 Fix debug various payment module. 
Fix debug report income/expense (for situation that should not happen
but if it happen, result is consistent with other screens).
 2020-12-09 21:51:01 +01:00
Laurent Destailleur
075cacb8cf Show setup of option SHOW_SUBPRODUCT_REF_IN_PDF 2020-12-09 17:40:28 +01:00
Alexandre SPANGARO
54fad02936 Fix PR 2020-12-08 13:55:51 +01:00
Alexandre SPANGARO
78dc1eaa83 Merge remote-tracking branch 'upstream/develop' into 14a5 2020-12-08 13:51:01 +01:00
Laurent Destailleur
f21a4e8aed
Merge branch 'develop' into develop#3 2020-12-07 22:46:36 +01:00
Laurent Destailleur
6abf1b6ac2 Error message 2020-12-07 20:59:07 +01:00
Hystepik
2ac98d06f5
Merge branch 'develop' into develop#3 2020-12-07 09:03:59 +01:00
Laurent Destailleur
1f83e22aea Fix set of translation of website page during cloning 2020-12-06 15:59:19 +01:00
Denis
2173b8566e Corrected "cash fence" to "cash desk closing" on english .lang files 2020-12-04 10:58:29 +01:00
Alexandre SPANGARO
13f985d280 NEW: Accountancy - Introduce "Level3" - Define account directly in thirdparty 2020-12-04 04:13:42 +01:00
Hystepik
ecb5a3b028
Merge branch 'develop' into develop#3 2020-12-03 10:12:19 +01:00
lmarcouiller
032116b235 changes to not diplay won and lost and add on migration 2020-12-03 10:11:16 +01:00
Laurent Destailleur
9e18997e64 FIX #15595 2020-12-02 16:35:43 +01:00
Laurent Destailleur
409b73fe2c FIX #15582 2020-12-02 15:16:04 +01:00
Laurent Destailleur
c8274f13eb
Merge pull request #15582 from Hystepik/develop 
Close #15307 New Widget : Encours dépassé
 2020-12-02 14:01:50 +01:00
Laurent Destailleur
28cb5d05ff Trans 2020-12-01 03:02:19 +01:00
Laurent Destailleur
fc5dc0865d Trans 2020-12-01 02:37:22 +01:00
Laurent Destailleur
fc97e9fe4f Fix trans 2020-12-01 01:38:06 +01:00
Laurent Destailleur
cf2dd28a21 Fix warning when setup not complete. 2020-11-30 19:40:53 +01:00
Laurent Destailleur
3443174f67 Sync transifex 2020-11-30 18:28:04 +01:00
lmarcouiller
6e9a3c05f4 Close : Encours dépassé #15307 2020-11-30 13:52:02 +01:00
Laurent Destailleur
379bca0b61 Clean code 2020-11-30 13:18:23 +01:00
Laurent Destailleur
66381a4f4d FIX #15558 2020-11-29 19:41:11 +01:00
Laurent Destailleur
6c65ebef0d Look and feel v13 2020-11-29 15:16:53 +01:00
Laurent Destailleur
fab9b3d50c Fix warning 2020-11-28 18:34:13 +01:00
Laurent Destailleur
7c4599a5c5 Look and feel v13 2020-11-28 01:15:23 +01:00
Laurent Destailleur
b3b511a6d4 FIX #15546 2020-11-26 22:44:11 +01:00
Laurent Destailleur
f231620084 Fix creation of MRP when product is a kit. 2020-11-26 14:32:40 +01:00
Laurent Destailleur
e1a6e8f2fc CSS 
Security: Add param to fight against Clickjacking attacks
 2020-11-26 11:29:16 +01:00
Laurent Destailleur
22bcb08950 Update doc 2020-11-25 23:03:17 +01:00
Laurent Destailleur
148f822251 Trans 2020-11-24 14:59:37 +01:00
Laurent Destailleur
551f82ef6a Fix label 2020-11-24 14:15:43 +01:00
Laurent Destailleur
53cf513173
Merge pull request #15180 from aspangaro/14a1 
NEW: Accountancy - Add export for Gestinum (v3 & v5)
 2020-11-24 09:10:59 +01:00
Laurent Destailleur
efc539c4b4 Fix css 2020-11-23 19:53:58 +01:00
Laurent Destailleur
d2d202dfc7 Fix ProfID5 must be EORI for ES too 2020-11-23 13:22:17 +01:00
Laurent Destailleur
edb462cca2 Trans 2020-11-22 12:32:08 +01:00
Laurent Destailleur
f39ad2359a Debug 2020-11-21 17:01:17 +01:00
Laurent Destailleur
95b79094df Fix warning. 
Module cron is more clear.
 2020-11-21 16:27:50 +01:00
Laurent Destailleur
3534555909 Fix setup of scheduled jobs 2020-11-21 14:14:53 +01:00
Laurent Destailleur
772d401a64 FIX Restore a more common behavior. Add a hidden constant to switch to a 
mode when we must enabled load of shippable status.
 2020-11-19 19:56:00 +01:00
Laurent Destailleur
9ef395a183
Merge pull request #15444 from OPEN-DSI/new-order-list-hide-shippable-icon-by-default 
NEW Add an option to hide by default icon shippable order in order list
 2020-11-19 18:53:13 +01:00
Laurent Destailleur
131c4f8ca8 Fix trans 2020-11-19 15:00:14 +01:00
Laurent Destailleur
939dfc7ead Add a test to avoid translation "=-" 2020-11-19 14:57:36 +01:00
Laurent Destailleur
caf77355ae Introduce EORI number 2020-11-19 14:38:11 +01:00
lvessiller
73dab143a3 NEW Add an option to hide by default icon shippable order in command list 2020-11-19 14:14:24 +01:00
Florian HENRY
46326d7659 merge from develop 2020-11-19 13:53:34 +01:00
Laurent Destailleur
b9f072498c Fix lang 2020-11-19 11:58:55 +01:00
Laurent Destailleur
6944e13b58 Fix % in lang file 2020-11-18 18:11:52 +01:00
Laurent Destailleur
32ae1bf350 Sync transifex 2020-11-18 15:56:06 +01:00
Laurent Destailleur
081474b65d Trans 2020-11-18 14:24:24 +01:00
Laurent Destailleur
cfee518338 Fix trans 2020-11-18 14:03:44 +01:00
kamel
73b35f334e NEW: Add new option for displaying Contact email (or phones if not defined) and town info list (select list or combobox) 
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand".
 2020-11-18 09:41:42 +01:00
Laurent Destailleur
d8753ea224 Fix trans 2020-11-16 14:15:54 +01:00
Laurent Destailleur
928330c44b Fix link to reconciliation page 2020-11-16 12:42:59 +01:00
Frédéric FRANCE
894e586669
add translation 2020-11-15 13:39:48 +01:00
Laurent Destailleur
8aaee7fa5e Fix replenishment must exclude parent of variants. 2020-11-13 11:28:02 +01:00
Laurent Destailleur
a98d025f5a Clean option for replenishment on real stock. 2020-11-13 11:06:51 +01:00
Laurent Destailleur
6d4d3c618d FIX #15369 and standardize permission "readall" 2020-11-13 09:55:53 +01:00
jcp
10ae18fe44 Update SQL migration 2020-11-12 19:42:20 +01:00
Laurent Destailleur
ec283dc04f Removed duplicated translation keys 2020-11-11 23:50:46 +01:00
Laurent Destailleur
741806f47e Clean code 2020-11-11 16:08:00 +01:00
Laurent Destailleur
47b3b30aaa Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/fourn/product/list.php
	htdocs/product/fournisseurs.php
	htdocs/societe/card.php
 2020-11-10 11:10:35 +01:00
Alexandre SPANGARO
77021bf355 Merge remote-tracking branch 'upstream/develop' into 14a1 2020-11-10 04:09:58 +01:00
jcp
50d530733e NEW: ICS fields moved into bank account table 2020-11-09 14:08:34 +01:00
Laurent Destailleur
136abc44e1 Fix clone in recruitment module 2020-11-09 09:13:24 +01:00
Alexandre SPANGARO
6b91f739be Merge remote-tracking branch 'upstream/develop' into 14a1 2020-11-08 03:58:22 +01:00
Florian HENRY
1bdd617feb NEW: Multiselect ledger account code filter on book keeping list 2020-11-07 15:31:27 +01:00
bahfir abbes
11099132da New: add notification on ACTION_CREATE event 2020-11-06 00:48:23 +01:00
Laurent Destailleur
6080e5335f Minor fix 2020-11-05 12:56:20 +01:00
Laurent Destailleur
779566ef30 Clean page with security summary 2020-11-05 10:03:53 +01:00
Laurent Destailleur
7afac764c3
Merge pull request #15271 from frederic34/patch-6 
typo
 2020-11-04 18:10:02 +01:00
Laurent Destailleur
38d88ced0b Debug the security page 2020-11-04 16:07:59 +01:00
Laurent Destailleur
7294a47ef5 Fix generation of user from member, contact, applications for job 2020-11-04 13:33:52 +01:00
jcp
518a225f7b NEW massaction for BankTransfer 2020-11-03 20:53:26 +01:00
Frédéric FRANCE
277045167d
typo 2020-11-03 08:10:22 +01:00
Laurent Destailleur
97c5747455 Look and feel v13 2020-11-03 04:19:04 +01:00
Laurent Destailleur
83a7b19333 Look and feel v13 2020-11-02 11:41:07 +01:00
Laurent Destailleur
582cbc3624
Merge pull request #15248 from frederic34/emailsubscription 
add missing pictos
 2020-11-01 18:00:18 +01:00
Laurent Destailleur
e0ed89c514 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/compta/facture/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/product/class/product.class.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
 2020-11-01 17:58:41 +01:00
Laurent Destailleur
45f834cb15 FIX #15199 2020-11-01 15:20:33 +01:00
Frédéric FRANCE
fcddf03164
fix 2020-11-01 14:13:39 +01:00
Laurent Destailleur
e5a5f37b3f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/bills.lang
 2020-10-31 15:09:26 +01:00
Laurent Destailleur
92bdcd017d Fix 2020-10-31 14:26:11 +01:00
Laurent Destailleur
11f9c4cfbd
Merge pull request #15117 from atm-jpb/develop_editorRate 
# New multi-currency exchange rate editor
 2020-10-31 13:55:42 +01:00
Laurent Destailleur
0a9c7fc577 Look and feel v13 2020-10-31 04:19:22 +01:00
Laurent Destailleur
23d0d4635a Trans 2020-10-30 18:16:19 +01:00
ATM john
61cb99117a Add missing lang trans 2020-10-30 09:33:07 +01:00
Florian HENRY
d77a0b40a8 tested and approuve feaure #15036 2020-10-28 16:37:41 +01:00
Alexandre SPANGARO
86ee75363a NEW: Accountancy - Add a ledger for subaccount 2020-10-28 09:49:38 +01:00
Alexandre SPANGARO
d46feda3e5 NEW: Accountancy - Add export for Gestinum (v3 & v5) 2020-10-27 16:13:07 +01:00
Laurent Destailleur
c81c3ec71a Fix translation 2020-10-27 03:20:33 +01:00
Laurent Destailleur
e637b60b4b Fix regression in language files 2020-10-27 03:04:53 +01:00
Laurent Destailleur
d2a2d74f7e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/product.lib.php
	htdocs/langs/am_ET/mrp.lang
	htdocs/langs/ar_SA/mrp.lang
	htdocs/langs/az_AZ/mrp.lang
	htdocs/langs/bg_BG/mrp.lang
	htdocs/langs/bn_BD/mrp.lang
	htdocs/langs/bn_IN/mrp.lang
	htdocs/langs/bs_BA/mrp.lang
	htdocs/langs/ca_ES/mrp.lang
	htdocs/langs/cs_CZ/mrp.lang
	htdocs/langs/da_DK/mrp.lang
	htdocs/langs/de_DE/mrp.lang
	htdocs/langs/el_GR/mrp.lang
	htdocs/langs/en_US/mrp.lang
	htdocs/langs/es_ES/mrp.lang
	htdocs/langs/et_EE/mrp.lang
	htdocs/langs/eu_ES/mrp.lang
	htdocs/langs/fa_IR/mrp.lang
	htdocs/langs/fi_FI/mrp.lang
	htdocs/langs/fr_FR/mrp.lang
	htdocs/langs/gl_ES/mrp.lang
	htdocs/langs/he_IL/mrp.lang
	htdocs/langs/hi_IN/mrp.lang
	htdocs/langs/hr_HR/mrp.lang
	htdocs/langs/hu_HU/mrp.lang
	htdocs/langs/id_ID/mrp.lang
	htdocs/langs/is_IS/mrp.lang
	htdocs/langs/it_IT/mrp.lang
	htdocs/langs/ja_JP/mrp.lang
	htdocs/langs/ka_GE/mrp.lang
	htdocs/langs/km_KH/mrp.lang
	htdocs/langs/kn_IN/mrp.lang
	htdocs/langs/ko_KR/mrp.lang
	htdocs/langs/lo_LA/mrp.lang
	htdocs/langs/lt_LT/mrp.lang
	htdocs/langs/lv_LV/mrp.lang
	htdocs/langs/mk_MK/mrp.lang
	htdocs/langs/mn_MN/mrp.lang
	htdocs/langs/nb_NO/mrp.lang
	htdocs/langs/ne_NP/mrp.lang
	htdocs/langs/nl_NL/mrp.lang
	htdocs/langs/pl_PL/mrp.lang
	htdocs/langs/pt_PT/mrp.lang
	htdocs/langs/ro_RO/mrp.lang
	htdocs/langs/ru_RU/mrp.lang
	htdocs/langs/sk_SK/mrp.lang
	htdocs/langs/sl_SI/mrp.lang
	htdocs/langs/sq_AL/mrp.lang
	htdocs/langs/sr_RS/mrp.lang
	htdocs/langs/sv_SE/mrp.lang
	htdocs/langs/sw_SW/mrp.lang
	htdocs/langs/th_TH/mrp.lang
	htdocs/langs/tr_TR/mrp.lang
	htdocs/langs/uk_UA/mrp.lang
	htdocs/langs/uz_UZ/mrp.lang
	htdocs/langs/vi_VN/mrp.lang
	htdocs/langs/zh_CN/mrp.lang
	htdocs/langs/zh_HK/mrp.lang
	htdocs/langs/zh_TW/mrp.lang
	htdocs/mrp/class/mo.class.php
	htdocs/mrp/mo_agenda.php
	htdocs/mrp/mo_card.php
	htdocs/mrp/mo_document.php
	htdocs/mrp/mo_movements.php
	htdocs/mrp/mo_note.php
	htdocs/mrp/mo_production.php
 2020-10-27 02:55:22 +01:00
Alfredo Altamirano
43fd659d2a Rename translation string MO for ManufacturingOrder 2020-10-26 15:38:42 -06:00
Marc de Lima Lucio
79ba133a07 NEW: ref in product customer price: fix missing language key 2020-10-26 13:05:26 +01:00
jpb
63c82b47fe Merge branch '11.0_currencyRateEditor' of github.com:atm-jpb/dolibarr into develop_editorRate 2020-10-23 12:27:14 +02:00
jpb
1ecff0a608 add list and crud 2020-10-23 11:58:25 +02:00
ptibogxiv
f3848dac1e
FIX lang to #15055 2020-10-22 20:06:56 +02:00
Laurent Destailleur
8074d2cc1d NEW Add validation of MX domain for emails 2020-10-22 20:01:59 +02:00
Florian HENRY
d347af385b new: add PDFInvoiceSituation translation key for PDF title 2020-10-21 13:47:40 +02:00
Laurent Destailleur
a729bff062 Fix trans 2020-10-21 11:54:18 +02:00
Laurent Destailleur
ef182bed07 Fix browser reminder 2020-10-18 14:00:47 +02:00
Laurent Destailleur
7b20e703ee Clean code 2020-10-17 15:53:31 +02:00
Laurent Destailleur
5df1218d9f Enhance page to setup email templates 2020-10-17 12:59:22 +02:00
Laurent Destailleur
e3552e7e02 Clean code 2020-10-16 20:17:54 +02:00
Laurent Destailleur
64b1a31e45
Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType 
NEW : Nature of product is now a dictionay
 2020-10-15 21:07:42 +02:00
Florian HENRY
0cb04d14d7 NEW: Thirdparty module : box on customer/supplier tab for outsantding amount late 2020-10-15 12:20:37 +02:00
Florian HENRY
fd1fa1c777 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 16:39:54 +02:00
Florian HENRY
7d09f22afa add correct import and dict edition 2020-10-14 16:39:42 +02:00
Laurent Destailleur
a0b17635fd NEW When creating a user from a member linked to a thirdparty, you can 
decide if it is an internal or external (default) user.
 2020-10-14 14:02:07 +02:00
Laurent Destailleur
02fcee5d94 Fix make the default sender email mandatory into setup (if not defined, 
no emails can be sent).
 2020-10-14 12:21:31 +02:00
Laurent Destailleur
969ed4acc1 Better label for status schedule of cron tasks. 2020-10-13 11:52:20 +02:00
Laurent Destailleur
726fd1b631
Merge pull request #11227 from aspangaro/10.0_intracommreport 
NEW module Intracomm report
 2020-10-12 13:35:58 +02:00
Laurent Destailleur
b27c95bab0
Merge pull request #14989 from FHenry/dev_finish_packingfeature 
fix : finish packging feature (allow to edit packaging quantity)
 2020-10-12 13:05:34 +02:00
Laurent Destailleur
a514c20183 Add warning if we try to add a task on a draft project 2020-10-12 12:53:57 +02:00
Laurent Destailleur
d831edb481 Fix bad popup 2020-10-12 12:33:58 +02:00
Florian HENRY
1f6a99e361 Merge github.com:Dolibarr/dolibarr into dev_finish_packingfeature 2020-10-12 11:11:23 +02:00
Florian HENRY
df4b208de1 fix: add missing edit field with pakaging option on 2020-10-12 11:10:49 +02:00
Alexandre SPANGARO
8876457b54 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-10 06:47:05 +02:00
Laurent Destailleur
967e7997e6 Trans and clean code 2020-10-09 19:34:57 +02:00
Laurent Destailleur
a23a91a4b9
Merge pull request #14971 from TobiasSekan/GlobalPaymentSearch 
NEW: Add global search for customer payments and vendor payments
 2020-10-09 13:56:52 +02:00
Laurent Destailleur
4eaf2c0350 Fix regression 2020-10-09 11:49:45 +02:00
Sekan, Tobias
35fbc602ee Add global payment search 2020-10-09 09:22:26 +02:00
Alexandre SPANGARO
ca7ad35342 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-09 06:39:42 +02:00
Laurent Destailleur
213cefb570
Merge pull request #14941 from aspangaro/13a22 
WIP NEW Add clone functionality on miscellaneous payment
 2020-10-07 15:31:09 +02:00
Laurent Destailleur
8febb19b50 Translation 2020-10-07 01:12:27 +02:00
Laurent Destailleur
294688891d CSS 2020-10-07 01:10:26 +02:00
Laurent Destailleur
4701656d95 Fix look and field v13 2020-10-06 13:08:20 +02:00
Laurent Destailleur
1c38379622 Better message 2020-10-06 12:22:58 +02:00
Laurent Destailleur
38acd83f4d Review some titles and tooltip help to be more clear. 2020-10-06 12:17:33 +02:00
Laurent Destailleur
c5c8bd7838
Merge pull request #14937 from aspangaro/13a21 
NEW Accountancy - Move to real ledger, real journals, menu disposition
 2020-10-06 10:04:41 +02:00
Alexandre SPANGARO
050a4770d3 WIP NEW Add clone functionality on miscellaneous payment 2020-10-06 10:04:15 +02:00
Laurent Destailleur
7c6c319607 Trans 2020-10-06 09:31:54 +02:00
Alexandre SPANGARO
6a0f2233a6 NEW Accountancy - Move to real ledger, real journals, menu disposition 2020-10-05 21:44:39 +02:00
Laurent Destailleur
73b40828c8 Trans 2020-10-05 18:15:37 +02:00
Laurent Destailleur
9b768b5eab
Merge pull request #14926 from aspangaro/13a17 
NEW Accountancy - Add chart of sub accounts
 2020-10-05 17:20:14 +02:00
Laurent Destailleur
23f1137c84
Merge pull request #14920 from rabib-metroworks/import-vendor-invoice 
NEW Can import Supplier invoice
 2020-10-05 16:44:49 +02:00
Alexandre SPANGARO
8ee7861276 Typo 2020-10-05 10:11:19 +02:00
Alexandre SPANGARO
cab6ef092f NEW Accountancy - Add chart of sub accounts 2020-10-05 10:05:21 +02:00
Laurent Destailleur
62177edab1 NEW Can force the antivirus from conf file or autoprepend ini setup. 2020-10-05 05:00:59 +02:00
Laurent Destailleur
fb15277c15 Better tooltip 2020-10-04 23:53:15 +02:00
Ahmad Jamaly Rabib
66a1aa9a86 NEW ADDED IMPORT TOOL FOR SUPPLIER INVOICE 
Added supplier invoice import functionality in import module
 2020-10-05 00:39:35 +06:00
Frédéric FRANCE
7afb62c55d
Merge remote-tracking branch 'upstream/develop' into ecm_extrafields 2020-10-02 00:24:48 +02:00
Frédéric FRANCE
f057488ae3
add extrafields on ecm 2020-10-02 00:21:13 +02:00
Laurent Destailleur
580df3d503
Merge pull request #14880 from rabib-metroworks/import-proposal 
NEW Can import proposals
 2020-10-01 19:09:14 +02:00
Laurent Destailleur
298e94e574 Typo 2020-10-01 11:16:43 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
9447eb2873 Typo 2020-10-01 09:50:09 +02:00
Laurent Destailleur
75ff2eb642 Typo 2020-10-01 09:39:18 +02:00
Laurent Destailleur
91f0429bd2 Fix mention for france, only for FR country 2020-10-01 09:34:10 +02:00
Ahmad Jamaly Rabib
0b35a07290 NEW ADDED IMPORT TOOL FOR PROPOSAL MODULE 
Added proposal import functionality in import module
 2020-10-01 11:52:56 +06:00
Laurent Destailleur
8b2ba8cbba Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/bom/bom_card.php
	htdocs/core/class/ldap.class.php
	htdocs/core/lib/files.lib.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/admin.lang
 2020-09-29 13:28:22 +02:00
Laurent Destailleur
1f8f2c0cc3 NEW Add 2 rules for emailcollector: Message send/not sent from Dolibarr 2020-09-29 13:13:47 +02:00
Laurent Destailleur
0093671a04
Merge pull request #14846 from aspangaro/13a19 
NEW Add export for various payment
 2020-09-28 17:40:18 +02:00
Laurent Destailleur
2cbec87ddc
Update accountancy.lang 2020-09-28 17:20:41 +02:00
Alexandre SPANGARO
88772726d7 New Add export for various payment 2020-09-28 09:32:49 +02:00
Alexandre SPANGARO
347537a205 Accountancy - Some fix 2020-09-28 06:44:01 +02:00
Laurent Destailleur
4a7df01339 Fix the MAIN_EXTERNAL_SMTP_SPF_STRING_TO_ADD should be 
MAIN_EXTERNAL_MAIL_SPF_STRING_TO_ADD
 2020-09-27 19:31:54 +02:00
Laurent Destailleur
4ca481335b
Merge pull request #14812 from atm-john/13.0_new_pdf_storm_for_delivery 
NEW PDF model storm for delivery
 2020-09-27 18:28:22 +02:00
Laurent Destailleur
96ae9c11f6
Revert "NEW Better currency rate editor" 2020-09-27 18:03:56 +02:00
Laurent Destailleur
cdc54a9f4a
Merge pull request #14820 from ATM-Consulting/new/develop/currency_rate_editor 
NEW Better currency rate editor
 2020-09-27 17:57:16 +02:00
Laurent Destailleur
cb6e4d131f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-27 17:13:41 +02:00
Laurent Destailleur
52d1f57276
Merge pull request #14828 from TobiasSekan/NewAllowReopenIntervention 
NEW Allow to reopen interventions (green button)
 2020-09-27 17:07:45 +02:00
Laurent Destailleur
d60ab93783 Typo 2020-09-27 16:59:27 +02:00
Laurent Destailleur
43cc009b54 Typo 2020-09-27 16:27:42 +02:00
Laurent Destailleur
3ee2459dc7 Enhancement for #14835: Can filter on expiration date, add list of 
members without subscriptions
 2020-09-27 16:03:20 +02:00
Laurent Destailleur
5d0c40c658 FIX for #14835 2020-09-27 15:08:15 +02:00
Sekan, Tobias
6fbc536061 Remoeve double lang entry 2020-09-25 08:15:20 +02:00
Sekan, Tobias
00951a8144 New allow to reopen interventions 2020-09-25 08:10:48 +02:00
Laurent Destailleur
09c6761dae NEW Include the tag editor of page as a popup into website editor 2020-09-23 16:36:19 +02:00
Florian Mortgat
70a0b6b90f Merge branch 'new/11.0_multicurrency_rate_editor' into new/develop/currency_rate_editor 2020-09-23 16:03:10 +02:00
John Botella
d3c9a035e9 Add new PDF model storm for delivery 2020-09-23 15:18:53 +02:00
Florian Mortgat
f97e9e4330 FIX: URL parameters vs. POST, tokens, use class CurrencyRate for CRUD 2020-09-23 14:22:27 +02:00
Florian Mortgat
592789c597 Exchange rate editor: +filters 2020-09-22 18:34:59 +02:00
Laurent Destailleur
e4bd75dbdc Enhancement for #14589 2020-09-22 16:26:53 +02:00
Florian Mortgat
b3f911f810 WIP: rate editor 2020-09-22 16:10:28 +02:00
Laurent Destailleur
288fd5566f FIX #14776 2020-09-22 16:02:00 +02:00
Laurent Destailleur
d21ee07afc NEW Can define date range of validity of a login during creation 2020-09-22 14:45:19 +02:00
Laurent Destailleur
830bc7d871 Look and feel v13 2020-09-22 09:42:44 +02:00
Laurent Destailleur
aee6bc173f WIP Add start/end date of validity for user/logins 2020-09-21 18:44:20 +02:00
Laurent Destailleur
ab94224d0c
Merge pull request #14668 from OPEN-DSI/email_smtp_allow_auto_signed 
NEW : Email configuration - Allow auto signed certificat when smtp ssl activated
 2020-09-20 17:56:23 +02:00
Laurent Destailleur
a3defd621c
Merge pull request #14726 from aspangaro/13a15 
Fix display on quickadd dropdown menu
 2020-09-20 17:30:35 +02:00
Laurent Destailleur
14aa9c01da Neutral message if login / email exists #yohosha4542 2020-09-19 18:40:00 +02:00
Laurent Destailleur
b1985950a6 Use POST to make the ajax set/del constant 2020-09-19 12:50:47 +02:00
Laurent Destailleur
f62d52f89a Fix tooltip for linkto object. 
Fix security of ajax selectobject.php
 2020-09-19 00:44:47 +02:00
Laurent Destailleur
4f2d3176f5 Fix #yogosha4533 2020-09-18 23:26:05 +02:00
Laurent Destailleur
534846c5c7 NEW Framework is ready for CSRF token protection on explicit GET URLs. 2020-09-18 04:30:24 +02:00
Laurent Destailleur
27d03a2034 Better support of SFTP for the FTP module 2020-09-18 00:36:24 +02:00
Laurent Destailleur
e123a4cb84 Fix help on minimum nb of chars 2020-09-17 15:09:29 +02:00
Laurent Destailleur
16b9e62866 FIX #yogosha4456 2020-09-17 14:20:37 +02:00
Laurent Destailleur
b5cac258bf
Merge pull request #14739 from defrance/patch-155 
Users can now have non-binary gender
 2020-09-16 00:54:07 +02:00
Laurent Destailleur
5c31593d43 Add date of birth in candidatures 2020-09-16 00:47:44 +02:00
Laurent Destailleur
51963f4c2a css 2020-09-15 13:48:48 +02:00
BENKE Charlene
0aa97a8b02
Update main.lang 2020-09-15 10:59:07 +02:00
Laurent Destailleur
59c10235b5 Show reminders on the event page 2020-09-14 21:06:40 +02:00
Laurent Destailleur
f626bd70d0 Look and feel v13 2020-09-14 20:53:42 +02:00
Laurent Destailleur
8afd448def Add warning if a hidden option is on to encourage to remove it. 2020-09-14 15:05:35 +02:00
Laurent Destailleur
550cec06a4 Look and feel v12 2020-09-14 14:41:11 +02:00
kkhelifa-opendsi
1f5f784b75
Merge branch 'develop' into email_smtp_allow_auto_signed 2020-09-14 10:25:15 +02:00
Laurent Destailleur
419ac91a7a FIX #14538 2020-09-14 03:34:03 +02:00
Laurent Destailleur
bd8185fb49 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-14 02:49:35 +02:00
Laurent Destailleur
59bc8ee07c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/stats/byproperties.php
	htdocs/adherents/stats/geo.php
	htdocs/admin/system/dolibarr.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/admin.lang
	htdocs/product/class/product.class.php
 2020-09-14 02:49:19 +02:00
Laurent Destailleur
3cb77d2e75
Merge pull request #14704 from aspangaro/13a12 
New Accountancy - Add default account for customer deposit
 2020-09-14 01:13:17 +02:00
Laurent Destailleur
dad02afa22
Update accountancy.lang 2020-09-14 01:13:07 +02:00
Laurent Destailleur
a4fb16b4f3 Add a warning to warn about security leak 2020-09-14 00:03:49 +02:00
Alexandre SPANGARO
2ae91b131f Fix display on quickadd dropdown menu 2020-09-13 22:17:24 +02:00
jove@bisquerra.com
e55c16c039 NEW Weighing Scale compatibility with TakePOS connector 2020-09-13 21:12:14 +02:00
Laurent Destailleur
7d25de5713 Enhance setup page for email setup 2020-09-12 15:39:14 +02:00
Laurent Destailleur
5ea3f09e17 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/translate.class.php
 2020-09-12 04:29:28 +02:00
Laurent Destailleur
990af9d5cf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
 2020-09-12 04:25:54 +02:00
Laurent Destailleur
4b525f6826 Debug notifications on browser 2020-09-12 04:12:39 +02:00
Laurent Destailleur
9dad8f0fb7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-12 03:02:27 +02:00
Laurent Destailleur
f45054df06 Close #14604 Merge manually change to get notification to show 
Remains: support call of the action=closereminderid done by browser once
notif has be thrown.
 2020-09-12 03:02:08 +02:00
Laurent Destailleur
1bdd4cae9b
Merge pull request #14699 from atm-adrien/NEW_add_widget_empty_tasks 
New add widget empty tasks
 2020-09-12 01:18:50 +02:00
Laurent Destailleur
5c776ccf3f
Merge pull request #14708 from TobiasSekan/AddGlobalMiscPaymentSearch 
NEW Add global search for miscellaneous payments
 2020-09-12 01:13:26 +02:00
Laurent Destailleur
7e989c8902 Remove TODO: Button Close possible only if production has started. 2020-09-11 12:36:31 +02:00
Sekan, Tobias
25d6af2b86 Add global search for misc payments +TODO 2020-09-11 09:55:34 +02:00
Alexandre SPANGARO
5b364fc5fa New Accountancy - Add default account for customer deposit 2020-09-10 21:56:55 +02:00
Laurent Destailleur
0d124730a8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/list.php
 2020-09-10 18:05:18 +02:00
Laurent Destailleur
3eba707e0f Trans 2020-09-10 17:09:32 +02:00
Adrien Raze
b4942707bb EN_US Traductions 2020-09-10 11:23:45 +02:00
Adrien Raze
76d5ce18ca Titres + lien cliquable client + traductions 2020-09-10 11:12:04 +02:00
Laurent Destailleur
08ab4855f2
Merge branch 'develop' into 13a11 2020-09-09 19:12:08 +02:00
Laurent Destailleur
abd1b1b4a9
Merge pull request #14657 from TobiasSekan/AddMissingTranslationsForPermissions 
FIX Add missing translations for permissions
 2020-09-09 15:27:22 +02:00
kamel
ccff18e2a5 NEW : Email configuration - Allow auto signed certificat when ssl activated 2020-09-08 14:48:50 +02:00
Laurent Destailleur
54c0f673c1 Debug hidden option MAIN_USE_EXPENSE_IK 2020-09-08 12:00:14 +02:00
Laurent Destailleur
86ed4dfa2b Debug hidden option MAIN_USE_EXPENSE_IK 2020-09-08 11:51:36 +02:00
Alexandre SPANGARO
d1ba6b9476 Merge remote-tracking branch 'upstream/develop' into 13a11 2020-09-08 05:01:36 +02:00
Alexandre SPANGARO
939933f4f7 Add some language key 2020-09-08 04:24:18 +02:00
Laurent Destailleur
f5eb8b0108 Look and feel v13 2020-09-08 04:21:35 +02:00
Laurent Destailleur
4db561656e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-08 02:11:23 +02:00
Laurent Destailleur
1a67b4efeb Debug 2020-09-08 02:11:09 +02:00
Alexandre SPANGARO
871826d023 Merge remote-tracking branch 'upstream/develop' into 13a8 2020-09-07 21:22:14 +02:00
Laurent Destailleur
e7ad8ef3a7 Translation missing 2020-09-07 14:47:25 +02:00
Sekan, Tobias
16bb33b619 Add missing translations for permissions 2020-09-07 14:29:36 +02:00
Laurent Destailleur
92e231e121
Merge pull request #14652 from atm-john/12.0_fix_lang_retained_warranty 
FIX: lang fr retained warranty
 2020-09-07 12:46:32 +02:00
John Botella
10d3405219 FIX: lang fr retained warranty 2020-09-07 12:21:00 +02:00
Laurent Destailleur
5a471d38c2
Merge pull request #14611 from atm-adrien/NEW_propal_massAction_validate_sign 
New : add massActions "Validate" and "Sign"
 2020-09-07 12:13:29 +02:00
Laurent Destailleur
1f6c0997f4 Add info when job is closed 2020-09-06 20:48:13 +02:00
Laurent Destailleur
263989019c
Merge pull request #14493 from aspangaro/13a4 
NEW Accountancy - Add options to disable accounting on sales, purchases & expense reports
 2020-09-04 23:10:15 +02:00
Laurent Destailleur
f04b5c48ea
Update accountancy.lang 2020-09-04 23:09:34 +02:00
Alexandre SPANGARO
247cc71ef4 Merge remote-tracking branch 'upstream/develop' into 13a8 2020-09-04 20:26:05 +02:00
Adrien Raze
bcd9a0b29f Retours PR 2020-09-03 14:25:17 +02:00
Laurent Destailleur
9868140693 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-02 19:20:12 +02:00
Laurent Destailleur
4dca1929e0 Can close a recruitment job 2020-09-02 19:19:47 +02:00
Adrien Raze
d6113acfc8 action presign/prevalidate + action sign/validate + Traductions 2020-09-02 15:20:10 +02:00
atm-lena
7b91c8efc8 Event Reminder : Add "Default Mail Model" to select Mail Model 2020-09-02 09:58:55 +02:00
Laurent Destailleur
def2bd5d6d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-01 16:36:26 +02:00
Alexandre SPANGARO
0336fe5686 NEW Accountancy - On transfers, select the periodicity by default 2020-09-01 16:18:07 +02:00
Laurent Destailleur
5d40380a07 Add index on status 2020-09-01 15:17:52 +02:00
atm-lena
d2ed43d913 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2 2020-09-01 09:43:14 +02:00
Laurent Destailleur
d69f08e489 WIP 2020-09-01 01:24:05 +02:00
Laurent Destailleur
ffb3d810de Complete fix for #14580 for v10 (backport of change of develop) 2020-08-31 16:21:59 +02:00
atm-lena
f8c79db4a9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2 2020-08-31 14:14:27 +02:00
Laurent Destailleur
0d4f7cb485 Fix responsive and title of reports 2020-08-30 17:42:49 +02:00
Laurent Destailleur
d94d7a1d0b Sync transifex 2020-08-30 16:28:07 +02:00
Laurent Destailleur
60ead7cefd Trans 2020-08-30 13:22:12 +02:00
Laurent Destailleur
3bef07697c Trans 2020-08-30 13:17:25 +02:00
Laurent Destailleur
e030b2089a Look and feel v13 2020-08-30 13:14:28 +02:00
Laurent Destailleur
b721930b3b
Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind 
Agenda Remind (Part 1)
 2020-08-29 05:19:21 +02:00
Laurent Destailleur
a1a05d55e4
Update admin.lang 2020-08-29 05:03:44 +02:00
Laurent Destailleur
e9c6911a23
Update admin.lang 2020-08-29 05:03:01 +02:00
Laurent Destailleur
04ad25d90f NEW Add the workflow interaction close intervention on closing ticket 2020-08-28 19:07:17 +02:00
Laurent Destailleur
9cd63d68bd
Update admin.lang 2020-08-28 17:58:02 +02:00
Laurent Destailleur
4ecd15b7ab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/main.lang
 2020-08-27 21:57:42 +02:00
Laurent Destailleur
5c1680e9c5
Merge branch 'develop' into master 2020-08-27 19:58:29 +02:00
Laurent Destailleur
8b95aa63eb Trans 2020-08-27 18:59:36 +02:00
atm-lena
c0f254d10c Translation + decode 2020-08-27 16:03:25 +02:00
atm-lena
e3ce3cbb7c Function sendEmailsReminder() 2020-08-27 15:49:56 +02:00
atm-lena
f57325237a WIP : sendEmailsReminder() 2020-08-27 12:30:59 +02:00
atm-lena
acb50950a4 Add a default message to "actioncomm_send" template 2020-08-27 11:31:48 +02:00
atm-lena
bbc554070c Fix 2020-08-27 09:33:40 +02:00
atm-lena
6a60228bc3 Translation 2020-08-26 17:11:32 +02:00
atm-lena
efe60ebc58 Error management 2020-08-26 17:02:34 +02:00
atm-lena
1267e914dc Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind 2020-08-26 15:16:53 +02:00
atm-lena
a4018f41f7 WIP 2020-08-26 10:52:36 +02:00
atm-lena
7df993c7ed Add "select_model_mail" function + add select to create event 2020-08-25 17:26:32 +02:00
atm-lena
6a94c0f52f Add model type mail 2020-08-25 16:43:57 +02:00
Laurent Destailleur
7c39543c72 Support trigger in module recruitment 
Enhance generic code of automatic recording events
 2020-08-25 12:47:38 +02:00
Alexandre SPANGARO
335f57f9be Fix language 2020-08-24 11:41:00 +02:00
Laurent Destailleur
b600478a5a Work on recruitment module 2020-08-23 22:11:16 +02:00
Laurent Destailleur
6685cc5bc8
Update admin.lang 2020-08-23 18:07:18 +02:00
Laurent Destailleur
9b7691c8d2
Update admin.lang 2020-08-23 18:04:02 +02:00
Laurent Destailleur
34d2d9a7c6 Look and feel v13 2020-08-23 15:17:22 +02:00
Laurent Destailleur
46a6161323 Trans 2020-08-23 13:30:05 +02:00
Alexandre SPANGARO
bf28201685 Fix Missing language key 2020-08-23 07:13:43 +02:00
Laurent Destailleur
a265bec7ca NEW Events in agenda for contact 
FIX Saving contacts of an events
 2020-08-23 02:38:56 +02:00
jove@bisquerra.com
d9cbd8f998 NEW: Print payment method and change in TakePOS 2020-08-22 18:28:15 +02:00
Laurent Destailleur
23cda5f464 Enhance recruitment module 2020-08-22 14:37:09 +02:00
Laurent Destailleur
ac1ae7a0d2 Debug 2020-08-22 04:05:31 +02:00
Laurent Destailleur
dabe804299 Add numbering modules for candidatures. Mass action Validate. 2020-08-22 03:49:46 +02:00
Laurent Destailleur
b80ba1179f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/accountancy/expensereport/lines.php
	htdocs/accountancy/supplier/lines.php
 2020-08-21 13:19:28 +02:00
Laurent Destailleur
220fc6db98 Work on recruitment module 2020-08-21 13:00:12 +02:00
Alexandre SPANGARO
065ace5301 Fix Missing language key on rights 2020-08-21 05:26:07 +02:00
Alexandre SPANGARO
76315fa6ac Fix Missing language key on rights 2020-08-21 05:22:31 +02:00
Alexandre SPANGARO
dd87362ce3 Fix Missing language key on rights 2020-08-21 05:20:53 +02:00
Alexandre SPANGARO
646d5cc9c8 Fix Missing language key on rights 2020-08-21 05:19:57 +02:00
Alexandre SPANGARO
881a9b7c04 Fix Missing language key on rights 2020-08-21 05:10:19 +02:00
Alexandre SPANGARO
bd5e35c15f Fix Missing language key 2020-08-21 05:00:38 +02:00
Laurent Destailleur
b2ed69100b Trans 2020-08-21 01:18:06 +02:00
Laurent Destailleur
ad0625b6ec Debug posting message from ticket page 2020-08-21 01:11:22 +02:00
Laurent Destailleur
3ebcd191bd NEW Add filter rules "is answer" and "is not answer" in email collector 2020-08-20 20:16:38 +02:00
Laurent Destailleur
605642d96a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-20 19:01:03 +02:00
Laurent Destailleur
66f9f37f41 Minor code and doc enhancement 2020-08-20 19:00:43 +02:00
Laurent Destailleur
fbb162aa9b Trans 2020-08-20 12:21:40 +02:00
Laurent Destailleur
25dfd32e0b
Merge pull request #14456 from andreubisquerra/master 
NEW: Delayed payment in TakePOS
 2020-08-19 14:36:34 +02:00
Laurent Destailleur
6ce9d573e2 Trans 2020-08-18 14:13:36 +02:00
Laurent Destailleur
e65e4a6d47 Beautify for of member module 2020-08-18 11:52:00 +02:00
Alexandre SPANGARO
3e80c71713 NEW Accountancy - Add options to disable binding on sales, purchases & expense reports independently of the modules 2020-08-18 07:38:46 +02:00
Laurent Destailleur
b623d79525
Merge pull request #14488 from egils-consulting/patch-10 
Update admin.lang
 2020-08-17 22:21:09 +02:00
Laurent Destailleur
24703b8fe7
Merge pull request #14487 from aspangaro/13a4 
NEW Add a start date to begin binding in accountancy
 2020-08-17 22:20:46 +02:00
Laurent Destailleur
bdcb945dda Work on inventory 2020-08-17 16:04:12 +02:00
Egil Priskorn
bf18f56056
Update admin.lang 
Small typo
 2020-08-17 15:33:36 +02:00
Alexandre SPANGARO
498431fa6f NEW Add a start date to begin binding in accountancy 2020-08-17 15:27:05 +02:00
Laurent Destailleur
75d368b706 Better translation of option 2020-08-17 14:08:52 +02:00
Laurent Destailleur
816aeadcba
Merge pull request #14465 from atm-john/develop_declinaison_price_multiple_merge 
NEW : Declinaison price level compatibility
 2020-08-16 23:18:49 +02:00
Alexandre SPANGARO
27c36713d3 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-08-16 22:10:02 +02:00
Laurent Destailleur
f6c1a14d50 CSS 2020-08-14 21:22:45 +02:00
Laurent Destailleur
a916f6af59 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2020-08-14 11:09:06 +02:00
Laurent Destailleur
0381cf5665 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/modules/modPaymentByBankTransfer.class.php
	htdocs/filefunc.inc.php
 2020-08-14 11:08:53 +02:00
Laurent Destailleur
056a503200 Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0 
Conflicts:
	htdocs/product/composition/card.php
 2020-08-14 11:06:39 +02:00
Laurent Destailleur
2b393d04e1 Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 11.0 2020-08-14 11:03:48 +02:00
Laurent Destailleur
d35c7ed49b Fix trans 2020-08-14 11:03:12 +02:00
Laurent Destailleur
f0046672fc
Merge pull request #14461 from atm-john/NEW_fill_service_dates 
NEW: new line template: hidden conf to fill service dates from the last service line
 2020-08-14 02:50:24 +02:00
Laurent Destailleur
88c07e86ad Organization of setup for Takepos bar features 2020-08-13 13:46:53 +02:00
John Botella
41cbe6db12 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_declinaison_price_multiple_merge 2020-08-12 10:39:21 +02:00
John Botella
f0268b4aaf Add declinaison price level 2020-08-12 10:14:29 +02:00
John Botella
47e664df8d Merge tag 'develop' of github.com:Dolibarr/dolibarr into NEW_fill_service_dates 2020-08-11 12:28:40 +02:00
jove@bisquerra.com
3be723f3a1 NEW: Delayed payment in TakePOS 2020-08-11 07:49:54 +02:00
John Botella
f014365b65 Fix lang fr 2020-08-10 10:35:50 +02:00
Laurent Destailleur
f132f272f2 Fix missing translation 2020-08-07 14:38:42 +02:00
Laurent Destailleur
7e15abc972 Fix missing translation 2020-08-07 14:34:21 +02:00
Laurent Destailleur
1bb24de555 Can set the language of a user. 2020-08-07 14:22:43 +02:00
Laurent Destailleur
e72e05d5f5 Add field default_lang for users 2020-08-07 13:31:23 +02:00
Laurent Destailleur
e830e7f3d3 Work on recruitment module 2020-08-06 13:14:43 +02:00
Laurent Destailleur
9d79e984dd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/tpl/stockcorrection.tpl.php
 2020-08-06 02:15:04 +02:00
Laurent Destailleur
1cf3422e05 FIX Bad adress of vendor in PDF for PDF of supplier payment 
FIX dol_convertToWord() Bad conversion of number into a string
 2020-08-06 01:56:42 +02:00
Laurent Destailleur
1f02b33195 Work on inventory 2020-08-05 12:25:26 +02:00
Laurent Destailleur
9d4e672475 FIX Debug direct debit module and credit transfer module 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
 2020-08-04 21:12:03 +02:00
Laurent Destailleur
5189e8beea FIX Debug direct debit module and credit transfer module 2020-08-04 20:26:57 +02:00
Laurent Destailleur
da76775fbd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/factures.php
	htdocs/compta/prelevement/fiche-rejet.php
 2020-08-03 21:18:45 +02:00
Laurent Destailleur
f62717a16a FIX Debug module direct debit order. Solve conflict with credit transfer 2020-08-03 20:16:33 +02:00
Laurent Destailleur
fb811a1656 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/database-tables.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/langs/fr_FR/withdrawals.lang
	htdocs/societe/class/societe.class.php
 2020-08-03 14:44:01 +02:00
Laurent Destailleur
e64b8eaf40 Fix debug credit transfer module 2020-08-03 11:21:13 +02:00
Laurent Destailleur
679625daee Trans 2020-08-03 09:51:15 +02:00
Laurent Destailleur
7297950308
Merge pull request #13759 from OPEN-DSI/stcommcontact 
NEW: Add prospect status managment for the contact with managment of custom icon
 2020-08-02 22:01:00 +02:00
Laurent Destailleur
aca20c89f9 Can use a generic email for recruitment 2020-08-02 18:45:42 +02:00
Laurent Destailleur
a300eae994 Sync transifex 2020-08-02 18:33:15 +02:00
Laurent Destailleur
d054aedc80 Sync language 2020-08-02 18:32:54 +02:00
Laurent Destailleur
04903460b1 Add contact on job page 2020-08-02 18:09:53 +02:00
Laurent Destailleur
be34a2c607 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/cashdesk.lang
	htdocs/product/stock/list.php
 2020-08-02 16:06:51 +02:00
jove@bisquerra.com
593c7242c4 NEW: TakePOS Gift Receipt 2020-08-02 11:13:41 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact 2020-07-31 16:41:17 +02:00
Laurent Destailleur
d4e21538db FIX Debug setup of receipt printer module 2020-07-31 13:40:36 +02:00
Laurent Destailleur
255dc71823 Missing translation 2020-07-31 13:20:05 +02:00
Laurent Destailleur
f5d7e94d7e NEW Add a stat page to list popularity of products on invoices 
Merge duplicate pages into 1.
 2020-07-30 19:32:06 +02:00
Laurent Destailleur
0bf678e09e Fix label of extrafields 2020-07-30 14:57:33 +02:00
Laurent Destailleur
c79d617a50 Add public page of job position offers 2020-07-30 03:50:27 +02:00
Laurent Destailleur
91a50038ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/fiche-stat.php
 2020-07-27 19:35:34 +02:00
Laurent Destailleur
8c06e3577d Fix several trouble with diret debit module and credit transfer module 2020-07-27 19:33:24 +02:00
Laurent Destailleur
19b550009b Trans 2020-07-27 02:38:31 +02:00
Laurent Destailleur
4fadd747ae Trans 2020-07-26 19:53:51 +02:00
Laurent Destailleur
dd86c21382 FIX dolGetElementUrl and agenda page for external modules 2020-07-25 03:01:04 +02:00
Laurent Destailleur
6e36fba4f3 NEW Development of module Recruitment 2020-07-24 11:54:57 +02:00
Laurent Destailleur
46fccf8eb1 FIX dolGetElementUrl and agenda page for external modules 2020-07-24 11:53:44 +02:00
Laurent Destailleur
f50fc751ab Trans 2020-07-24 10:02:24 +02:00
Laurent Destailleur
ce3248ab57 Trans 2020-07-24 10:01:05 +02:00
Laurent Destailleur
afbeb026ab Trans 2020-07-24 09:56:14 +02:00
Laurent Destailleur
aefb1483e3 NEW Can change size of logo on PDF documents 2020-07-24 03:36:44 +02:00
Laurent Destailleur
cf89e159bd Typo 2020-07-24 03:19:37 +02:00
Laurent Destailleur
895fe63d3b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-24 01:53:51 +02:00
Laurent Destailleur
0f4e00a2a3 Fix language 2020-07-24 01:43:03 +02:00
Laurent Destailleur
d823bb73c0 Change order of fields for mass stock movement 2020-07-20 01:01:40 +02:00
Laurent Destailleur
c91236244e Enhance Stock at date feature 2020-07-10 20:33:06 +02:00
Laurent Destailleur
a155b20b2f Trans 2020-07-10 16:27:59 +02:00
Laurent Destailleur
96c583b84e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-10 02:28:34 +02:00
Laurent Destailleur
e8dd99a9cd Trans 2020-07-10 01:11:37 +02:00
Laurent Destailleur
d18188d565 Fix missing trans 2020-07-10 00:57:29 +02:00
Laurent Destailleur
bd63b84f8e Fix label of social contribution and button date 2020-07-09 23:18:19 +02:00
Laurent Destailleur
6b5f46624c Fix label of AWP 2020-07-09 16:19:40 +02:00
Laurent Destailleur
a59b37cb72 Trans 2020-07-09 15:44:42 +02:00
Laurent Destailleur
e6b241a083 NEW Show tags and status in search list of website pages 2020-07-09 14:07:41 +02:00
Laurent Destailleur
49faaf750f Trans 2020-07-09 12:39:43 +02:00
Laurent Destailleur
9592fdb3fc CSS 2020-07-09 11:55:16 +02:00
Laurent Destailleur
5ea47f3ade Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/product/admin/product.php
	htdocs/projet/tasks/list.php
 2020-07-08 18:11:58 +02:00
Laurent Destailleur
96729769f7 Standardize Agenda view 2020-07-08 18:06:14 +02:00
Laurent Destailleur
bec27a04ba Trans 2020-07-07 21:16:20 +02:00
Laurent Destailleur
cb5577826d Look and feel v13 2020-07-07 03:50:14 +02:00
Laurent Destailleur
e13d3ce657 Trans 2020-07-06 20:57:47 +02:00
Laurent Destailleur
9b1163cfb8 Fix menu organisation. 2020-07-06 11:52:28 +02:00
Laurent Destailleur
056aa81ed3 Fix responsive 2020-07-06 10:59:23 +02:00
Alexandre SPANGARO
dc40ddb370 Some correction 2020-07-06 09:56:28 +02:00
Alexandre SPANGARO
59ee22537d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-07-06 03:24:27 +02:00
Laurent Destailleur
344098fe23 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/actions_fetchobject.inc.php
	htdocs/langs/fr_FR/contracts.lang
	htdocs/langs/fr_FR/loan.lang
	htdocs/langs/fr_FR/stocks.lang
 2020-07-05 13:01:00 +02:00
Laurent Destailleur
d18ce3b39e Look and feel v12 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
 2020-07-05 12:54:42 +02:00
Laurent Destailleur
9057559ab5 Trans 2020-07-05 12:47:32 +02:00
Laurent Destailleur
176f678a85 Look and feel v12 2020-07-05 12:46:15 +02:00
Laurent Destailleur
a0d6c9ce70 Trans 2020-07-05 12:30:04 +02:00
Laurent Destailleur
83eaddb17b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/evalmath.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/install/mysql/migration/11.0.0-12.0.0.sql
	htdocs/langs/en_US/cashdesk.lang
	htdocs/societe/class/societe.class.php
 2020-07-04 13:13:17 +02:00
Laurent Destailleur
4819e58d06 Fix trans 2020-07-04 13:04:53 +02:00
Laurent Destailleur
fce81a4bf1 Rename var and fix position of checkbox 2020-07-03 01:30:53 +02:00
Laurent Destailleur
6b3eeebe87
Merge branch 'develop' into dev-replenish 2020-07-03 01:03:35 +02:00
Laurent Destailleur
16b327f106 Debug module credit transfer 2020-07-02 15:45:11 +02:00
jove@bisquerra.com
76f3724191 NEW: Appearance tab in TakePOS with more visual parameters 2020-07-01 22:34:35 +02:00
Laurent Destailleur
5f2486049e Fix trans 2020-07-01 13:22:15 +02:00
Laurent Destailleur
4f1ac84a19 Fix can't find link to edit table plan 2020-06-30 12:07:24 +02:00
Laurent Destailleur
146c521efd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/filefunc.inc.php
 2020-06-29 18:06:42 +02:00
Laurent Destailleur
68b4866438 Trans 2020-06-29 09:43:39 +02:00
Laurent Destailleur
ab88890f3a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-28 21:48:28 +02:00
Laurent Destailleur
4dfd016504
Merge pull request #14140 from fappels/12_missing_translate 
Fix missing translate key
 2020-06-28 21:07:49 +02:00
Laurent Destailleur
a3ae7a76b8 WIP Stock at date 2020-06-28 19:35:24 +02:00
Laurent Destailleur
d22a0f702e WIP Stock at date 2020-06-28 17:34:30 +02:00
Laurent Destailleur
90d4458aab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2020-06-27 00:38:51 +02:00
Francis Appels
f4494db73f Fix missing translate key 2020-06-26 17:34:11 +02:00
Laurent Destailleur
29ba9c82c3 Fix #14120 2020-06-26 17:17:13 +02:00
Laurent Destailleur
c32151d356 Prepare page for stock at date 2020-06-25 01:07:30 +02:00
Laurent Destailleur
ee5156034d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-24 20:03:40 +02:00
Laurent Destailleur
02e022ebfa Fix class not found for supplier credit. Class must be into 
commoninvoice
 2020-06-24 19:59:06 +02:00
Laurent Destailleur
de62037ba5 Fix signed only in margin calculation of project 2020-06-24 12:58:10 +02:00
Laurent Destailleur
6d25b8630b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/prelevement.php
	htdocs/core/class/rssparser.class.php
 2020-06-23 11:38:20 +02:00
Laurent Destailleur
566c1aaf84 Fix for credit transfer module 2020-06-22 22:54:33 +02:00
Laurent Destailleur
501fd2f7a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/admin/receipt.php
 2020-06-21 20:48:41 +02:00
Marc Guenneugues
f86f4c1e1d Change label of checkbox to be more explicit 2020-06-21 19:02:20 +02:00
Laurent Destailleur
cdcc87a565 Fix lang 2020-06-21 15:25:34 +02:00
Laurent Destailleur
ccc55dcb1e Debug Receipt printer module and reduce duplicate translation key 2020-06-20 15:19:19 +02:00
Laurent Destailleur
c54294285a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
 2020-06-20 12:28:14 +02:00
jove@bisquerra.com
ad432e1e9b Printable QR 2020-06-20 12:20:53 +02:00
Laurent Destailleur
450c340cb1 Trans 2020-06-20 12:19:25 +02:00
Laurent Destailleur
f24e73141e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-19 14:53:31 +02:00
Laurent Destailleur
15af3d68fc FIX #13877 2020-06-19 14:50:33 +02:00
Laurent Destailleur
01914980d9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/notice.php
 2020-06-19 00:45:06 +02:00
Laurent Destailleur
4cfe1fcd6b Typo 2020-06-18 15:57:50 +02:00
Laurent Destailleur
a607ff4c1a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/core/lib/project.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/products.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/langs/fr_FR/ticket.lang
	htdocs/mrp/mo_card.php
 2020-06-18 15:50:31 +02:00
Laurent Destailleur
ade542eee7 Sync language 2020-06-18 10:05:00 +02:00
Laurent Destailleur
fded55ddef Fix sepa supplier count 2020-06-18 03:44:26 +02:00
Laurent Destailleur
1ed649ff28 Fix tooltip on project not visible sometimes 2020-06-18 02:50:46 +02:00
Laurent Destailleur
dc70cab2cb Fix tooltip 2020-06-17 22:29:05 +02:00
Laurent Destailleur
6c2d70d43b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-17 19:27:39 +02:00
Laurent Destailleur
adb988a18b FIX Add missing label of event for #14094. Still missing link to object 2020-06-17 15:45:26 +02:00
Laurent Destailleur
c36c8ed447 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
 2020-06-17 15:28:19 +02:00
Laurent Destailleur
1a7f0741b5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/fourn/class/paiementfourn.class.php
 2020-06-17 14:53:24 +02:00
Laurent Destailleur
6d6abd4320 FIX vulenrability reported by wizlynx WLX-2020-012 2020-06-17 14:45:15 +02:00
Laurent Destailleur
9f69e31950
Merge pull request #14089 from atm-quentin/NEW_hide_contract_closed_lines 
NEW hide closed contract lines
 2020-06-17 12:11:00 +02:00
Laurent Destailleur
faf4da0d68
Merge branch 'develop' into fixloan2 2020-06-16 22:40:45 +02:00
atm-quentin
e3d94d44ab NEW hide closed contract lines 2020-06-16 10:45:49 +02:00
Laurent Destailleur
e28bbfbd63 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-15 16:10:49 +02:00
Laurent Destailleur
7b64e8643f Trans and css 2020-06-15 16:08:48 +02:00
DEMAREST Maxime (Indelog)
4df658ccb2 Fix and improvement on Loan module 
* Fix page redirection on loan delete.
* Add dedicated status for loan with started payment (show if payment is
  started on loan card).
* Add fk_payment_loan property for loan_schedule and add link to loan payment
  on shedule page for paid line.
* Make it not possible to use schedule if start loan payment without it (else
  values in schedule can't be good).
* If modify capital in payment with schedule set, automatically updates it
  with the new value.
* Can't modify interest in payment if schedule is used (causes the
  inconsistency for value in schedule).
* User right verification on schedule page.
 2020-06-13 09:32:44 +02:00
Laurent Destailleur
cc9a964b5d
Update products.lang 2020-06-12 01:58:47 +02:00
Laurent Destailleur
fa3ca5c644
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-06-12 01:00:15 +02:00
Laurent Destailleur
90b5ed9908 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
 2020-06-11 23:41:35 +02:00
Laurent Destailleur
e087edf005 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/ticket/class/ticket.class.php
 2020-06-11 23:39:26 +02:00
Laurent Destailleur
ffb345e724
Merge pull request #14062 from atm-florianm/11.0_FIX_missing_translation 
FIX: missing translation value for key "NoMorePredefinedProductToDispatch"
 2020-06-11 23:05:55 +02:00
Anthony Berton
bda4753e41
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-06-11 18:44:38 +02:00
Laurent Destailleur
4b2a570a23 Error message 2020-06-09 22:44:25 +02:00
Laurent Destailleur
a86e209a75 Fix message 2020-06-09 22:43:37 +02:00
Laurent Destailleur
c175fbd697 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/website/class/website.class.php
	htdocs/website/index.php
 2020-06-09 22:09:57 +02:00
Laurent Destailleur
756ef0b583 Fix disallow < > into meta info 
Fix message page regenerated
 2020-06-09 21:43:42 +02:00
Florian Mortgat
d19febc2ca FIX: missing translation value for key "NoMorePredefinedProductToDispatch" 2020-06-09 17:34:24 +02:00
Laurent Destailleur
0f1447cf05 Fix position of clone 2020-06-08 23:42:48 +02:00
Laurent Destailleur
ff9312c96a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/class/ligneprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/line.php
 2020-06-08 20:36:54 +02:00
Laurent Destailleur
233c7e53f1 Debug v12 2020-06-08 20:31:09 +02:00
Laurent Destailleur
cf976a2b98 Fix translation 2020-06-08 17:00:58 +02:00
Laurent Destailleur
2e06ce306a Tooltip 2020-06-08 15:03:10 +02:00
Laurent Destailleur
70bdd59548 Fix trans 2020-06-08 11:52:43 +02:00
Laurent Destailleur
c386f4b2e3 Maxi debug of direct debit order 2020-06-08 11:43:20 +02:00
Laurent Destailleur
7d3039d41f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/user/card.php
 2020-06-06 23:04:55 +02:00
Laurent Destailleur
19405d5f5b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2020-06-06 23:02:05 +02:00
Laurent Destailleur
cbafbe16a2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/supplier/index.php
	htdocs/admin/mails_templates.php
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/langs/en_US/admin.lang
 2020-06-06 23:00:24 +02:00
Laurent Destailleur
da672c8776 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/admin/translation.php
	htdocs/core/class/html.formfile.class.php
	htdocs/societe/card.php
 2020-06-06 11:57:31 +02:00
Laurent Destailleur
d252248319 Fix back to link in ECM menu 
Fix picto in search_page
 2020-06-05 13:41:33 +02:00
Laurent Destailleur
f92426034f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/index.php
 2020-06-03 01:06:27 +02:00
Laurent Destailleur
a2287b3061 Trans 2020-06-02 20:19:14 +02:00
gauthier
68bb552dcc FIX : Tickets mail models doesn't work 2020-06-02 17:06:49 +02:00
Laurent Destailleur
a9973ad60e Fix language key and css 2020-06-02 15:30:07 +02:00
Laurent Destailleur
9a30d4ca44 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-02 13:32:02 +02:00
Laurent Destailleur
3b4fe0d582 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/product/class/html.formproduct.class.php
 2020-06-02 13:31:22 +02:00
Laurent Destailleur
5141fe0a74
Merge pull request #14017 from andreubisquerra/12.0 
Fix QR and add QR customer menu
 2020-06-01 20:07:21 +02:00
Florian Mortgat
3213148d87 FIX 11.0 - when using pdftk as per hidden conf USE_PDFTK_FOR_PDF_CONCAT, check that the file exists before displaying a success message 2020-06-01 17:12:02 +02:00