Commit Graph

87205 Commits

Author SHA1 Message Date
Laurent Destailleur
386b27a14c Standardize code 2020-04-02 14:32:54 +02:00
Laurent Destailleur
83fdc5b901
Merge pull request #13429 from TobiasSekan/NewTreeViewForSubCategories
NEW Tree view for sub-categories
2020-04-02 13:39:43 +02:00
Laurent Destailleur
87d46c4e86
Merge pull request #13473 from nervo/patch-1
NEW [Allow constants values to be overridden by environment variables]
2020-04-02 13:33:47 +02:00
Laurent Destailleur
e8fa0ec50c
Merge pull request #13467 from Je2fb/develop
Update card.php
2020-04-02 13:30:40 +02:00
Laurent Destailleur
123c19086b
Merge pull request #13465 from fabianpc/db_issues
Close #13446 Infinite loop of projects without thirdparty...
2020-04-02 13:29:11 +02:00
Laurent Destailleur
3c75c29e6b
Merge pull request #13463 from atm-quentin/FIX_buyprice_filter_was_only_qty
FIX : Buyprice was updated only if min price for this qty had same qty
2020-04-02 13:08:40 +02:00
Laurent Destailleur
7ad67ff91d
Merge pull request #13462 from atm-florian/11.0
fix advtargetemailing : fatal call to static attribut (table_element is not a static attribut)
2020-04-02 13:05:12 +02:00
Laurent Destailleur
3b6db77cb3
Merge pull request #13460 from atm-quentin/FIX_multicurrency_SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL
FIX multicurrency manage on hidden conf SUPPLIER_PROPOSAL_UPDATE_PRIC…
2020-04-02 13:04:00 +02:00
Laurent Destailleur
c6f57c46a8
Update supplier_proposal.class.php 2020-04-02 13:01:49 +02:00
Laurent Destailleur
79b1a2e191
Merge pull request #13457 from oscim/patch-30
Update expedition.class.php
2020-04-02 12:57:24 +02:00
Laurent Destailleur
967a6accee
Merge pull request #13461 from oscim/patch-32
NEW Add company extrafields into order export
2020-04-02 12:57:05 +02:00
Laurent Destailleur
bec231bd7b
Merge pull request #13459 from oscim/patch-31
Update expedition.class.php
2020-04-02 12:55:58 +02:00
Laurent Destailleur
13afd2c199
Merge pull request #13455 from oscim/patch-28
Update livraison.class.php
2020-04-02 12:55:27 +02:00
Laurent Destailleur
a2fd363f91
Update livraison.class.php 2020-04-02 12:55:06 +02:00
Laurent Destailleur
276c860910
Merge pull request #13453 from ptibogxiv/patch-317
NEW compatibility of translatebel with more dict
2020-04-02 12:53:59 +02:00
Laurent Destailleur
a94f8572f1
Update api_setup.class.php 2020-04-02 12:53:41 +02:00
Laurent Destailleur
ec0fe28da8
Merge pull request #13452 from andreubisquerra/master
NEW: Cash Control in TakePOS
2020-04-02 12:51:36 +02:00
Laurent Destailleur
a923ef5a6d
Merge pull request #13456 from atm-gauthier/9.0_fix_migrate_picture_path_script
FIX : picture migration script from doli 9.0
2020-04-02 12:50:23 +02:00
Laurent Destailleur
deaae1d1f1
Merge pull request #13469 from cfoellmann/batch-extension
change batches max length to 128 characters on sql migration
2020-04-02 12:49:31 +02:00
Laurent Destailleur
c225f35eff
Update 11.0.0-12.0.0.sql 2020-04-02 12:49:20 +02:00
Laurent Destailleur
00a12b9fc8
Merge pull request #13475 from thepocagency/11.0_fix_extrafield_lines_in_template
Copy extrafields of lines from a draft invoice to an invoice template
2020-04-02 12:47:34 +02:00
jribal
7380fa32ec On _checkAccessToResource: category -> categorie 2020-04-02 12:44:50 +02:00
Laurent Destailleur
e79c98baed
Merge pull request #13470 from jribal/patch-1
On _checkAccessToResource: category -> categorie
2020-04-02 12:44:26 +02:00
Laurent Destailleur
bb9a4324d1
Merge pull request #13471 from atm-florianm/NEW_add_author_column_on_invoice_list_and_supplier_invoice_list
NEW: "author" column in the client/supplier invoice lists
2020-04-02 12:40:51 +02:00
Laurent Destailleur
a7656793da
Merge pull request #13479 from altatof/md
FIX md stylesheet to be included by external modules like eldy
2020-04-02 12:40:10 +02:00
Laurent Destailleur
5135474232
Merge pull request #13477 from atm-florianm/FIX_error_log_wrong_method_name_logged_for_insert
Fix insert error logged as a delete error
2020-04-02 12:38:51 +02:00
Laurent Destailleur
5d9d62f185
Merge pull request #13480 from atm-florian/develop
fix: correct hook init invoice_rec list
2020-04-02 12:38:32 +02:00
Laurent Destailleur
9f55918cb8 Remove Geoipv1 library. We use now v2 2020-04-02 12:37:21 +02:00
Laurent Destailleur
b8eaf8dd03 Removed jflot js library (we now use ChartJS) 2020-04-02 12:29:15 +02:00
Laurent Destailleur
5622c1947b Prepare 10.0.7 2020-04-02 12:23:53 +02:00
Laurent Destailleur
84cda962c1 Clean dead code 2020-04-02 12:03:29 +02:00
florian HENRY
10391a5769 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2020-04-02 10:45:46 +02:00
florian HENRY
609de965b1 fix: hook init invoicerec list normalyse 2020-04-02 10:45:14 +02:00
altairis
a743110f03 FIX md stylesheet to be included by external modules like eldy 2020-04-02 10:44:24 +02:00
Florian Mortgat
4d2b4583d0 FIX - This error logs an Orderline::delete error, but this is an Orderline::insert error 2020-04-02 09:28:56 +02:00
stickler-ci
9476fbc3e7 Fixing style errors. 2020-04-01 23:16:13 +00:00
Alex Veremme
7330c31204 Fix ##13474: copy extrafields of LINES from a draft invoice to an
invoice template
2020-04-02 01:10:56 +02:00
Laurent Destailleur
f6b216eafc Fix travis 2020-04-01 23:32:44 +02:00
Laurent Destailleur
6aea67a5b9 Work on extralanguages 2020-04-01 23:15:53 +02:00
stickler-ci
cf3615aee3 Fixing style errors. 2020-04-01 20:11:18 +00:00
nervo
abd6465190
Allow constants values to be overridden by environment variables 2020-04-01 22:02:34 +02:00
Laurent Destailleur
184d50171d Update example for clamav - prefer clamav daemon 2020-04-01 22:01:05 +02:00
Laurent Destailleur
70706d9ea7 FIX Missing token and take into account max date when it can. 2020-04-01 18:48:45 +02:00
Laurent Destailleur
d2de6a22eb WIP Can set values in extra languages 2020-04-01 18:11:28 +02:00
Florian Mortgat
f52af23396 NEW: "author" column in the client/supplier invoice lists 2020-04-01 17:09:01 +02:00
Laurent Destailleur
4727800206 Can show technical ID of any object in banner. 2020-04-01 16:51:45 +02:00
Laurent Destailleur
33d2b61c19 Work on extralanguages 2020-04-01 16:21:03 +02:00
ATM john
81adc6913e change conf usage 2020-04-01 12:12:30 +02:00
jribal
cae0f210a2
On _checkAccessToResource: category -> categorie 2020-04-01 11:09:40 +01:00
Christian Foellmann
6aa65f1a02 change batches max length to 128 characters on sql migration 2020-04-01 09:57:51 +02:00