Commit Graph

22973 Commits

Author SHA1 Message Date
Laurent Destailleur
84105e996a Fix for #14940 2020-10-07 01:03:48 +02:00
Laurent Destailleur
ea8ec4ea90 Clean code 2020-10-07 00:59:05 +02:00
Laurent Destailleur
77788a0591 Clean code 2020-10-07 00:26:03 +02:00
Laurent Destailleur
f16a58a62c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/modSocialNetworks.class.php
2020-10-06 23:36:15 +02:00
Laurent Destailleur
47c80f0d14 Merge pull request #14942 from TobiasSekan/ShowProjectOverviewCount
Show count on project overview tab
2020-10-06 23:34:43 +02:00
Laurent Destailleur
13ec304b79 Update project.lib.php 2020-10-06 23:30:51 +02:00
Laurent Destailleur
04f8de4188 Remove dependency 2020-10-06 17:59:31 +02:00
Laurent Destailleur
2c5d396546 Fix upload file 2020-10-06 17:45:08 +02:00
Laurent Destailleur
459ebe2e56 css 2020-10-06 17:26:55 +02:00
Laurent Destailleur
663f149982 Better error management 2020-10-06 16:48:48 +02:00
AurelienBinard
39d538befc Merge branch 'develop' into translateModLivraison2ModDelivery 2020-10-06 16:20:25 +02:00
Aurélien
f954e8b173 :mod livraison rename user acces right #14697 2020-10-06 16:10:48 +02:00
Aurélien
c8cd55e158 debug access right after rename class #14697 2020-10-06 15:57:50 +02:00
Laurent Destailleur
95f67309e2 Clean code 2020-10-06 15:11:45 +02:00
Aurélien
1af42b313c rename livraison pdf and dependencies #14697 2020-10-06 13:32:02 +02:00
Laurent Destailleur
254d9edbb9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-06 13:18:58 +02:00
Laurent Destailleur
6933b7ec9c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/lib/agenda.lib.php
2020-10-06 13:15:52 +02:00
Laurent Destailleur
989074f13a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-10-06 13:13:31 +02:00
Laurent Destailleur
4701656d95 Fix look and field v13 2020-10-06 13:08:20 +02:00
Sekan, Tobias
3ceb5c217f Show count on project overview tab 2020-10-06 12:56:28 +02:00
Aurélien
af7c23b2ac rename folder admin/livraison.php and dependencies #14697 2020-10-06 12:05:24 +02:00
Aurélien
5571a166c6 change variable #14697 2020-10-06 11:37:55 +02:00
Aurélien
140200213e change table into DB and ref #14697 2020-10-06 11:04:31 +02:00
lvessiller
496150d747 FIX extrafield required error after submit 2020-10-06 10:21:24 +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
Laurent Destailleur
8d0b9169bc Merge pull request #14936 from aspangaro/13a20
NEW Vat report - Invert constant to show by default zero vat in reports
2020-10-06 10:00:00 +02:00
Alexandre SPANGARO
6a0f2233a6 NEW Accountancy - Move to real ledger, real journals, menu disposition 2020-10-05 21:44:39 +02:00
Alexandre SPANGARO
d83d9895e0 NEW Vat report - Invert constant to show by default zero vat in reports 2020-10-05 20:52:31 +02:00
Frédéric FRANCE
005cc093b9 fix typo 2020-10-05 20:02:23 +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
Laurent Destailleur
196cb9c7f6 Merge pull request #14929 from rabib-metroworks/import-order-module
NEW Can import sales order
2020-10-05 16:43:29 +02:00
Laurent Destailleur
24527c973d Merge pull request #14910 from ptibogxiv/patch-375
Fix multicompany in activity box
2020-10-05 16:42:14 +02:00
Laurent Destailleur
e5cdffcdec Merge pull request #14922 from andreubisquerra/develop
TakePOS connector compatibility with RECEIPT PRINTERS module
2020-10-05 16:38:56 +02:00
Aurélien
c1b0c1f6a2 rename folder ref to Module Delivery 2020-10-05 15:32:29 +02:00
Laurent Destailleur
afd6da3b94 Better error management 2020-10-05 14:51:28 +02:00
Aurélien
bdd095f6bb translate livraison2delivery => change folder, filename and class ref into all dependencies #14697 2020-10-05 13:59:59 +02:00
Ahmad Jamaly Rabib
4a6000c750 NEW ADDED IMPORT TOOL FOR CUSTOMER ORDER
Added Order import functionality in import module
2020-10-05 16:39:26 +06:00
Laurent Destailleur
cfc3c01815 Factorize code to know if a parameter is used to store a secret 2020-10-05 12:13:06 +02:00
Alexandre SPANGARO
cab6ef092f NEW Accountancy - Add chart of sub accounts 2020-10-05 10:05:21 +02:00
Laurent Destailleur
8a079cf716 Code comment 2020-10-05 09:31:12 +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
a68ba1704b Fix phpcs 2020-10-05 02:25:57 +02:00
Laurent Destailleur
800c0d2b00 Fix method must return a string not print on output 2020-10-05 02:24:45 +02:00
Laurent Destailleur
63415e9728 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/boxes/box_commandes.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/boxes/box_shipments.php
	htdocs/core/boxes/box_supplier_orders.php
	htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
	htdocs/core/tpl/objectline_edit.tpl.php
2020-10-04 23:27:52 +02:00
Laurent Destailleur
ca16606b4f Fix phpcs 2020-10-04 23:21:24 +02:00
andreubisquerra
65c6881fc9 NEW: TakePOS connector compatibility with RECEIPT PRINTERS module 2020-10-04 22:49:47 +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
ptibogxiv
4aafe72bf2 Fix multicompany in activity box 2020-10-04 14:19:53 +02:00
ptibogxiv
dd1904c521 Fix multicompany in last action box 2020-10-04 13:58:46 +02:00