Commit Graph

89109 Commits

Author SHA1 Message Date
Laurent Destailleur
4170580d88 Rename const 2020-04-03 12:54:23 +02:00
Laurent Destailleur
7b55deccac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-03 03:04:39 +02:00
Laurent Destailleur
b5e5d96d50 Doxygen 2020-04-03 03:04:23 +02:00
Laurent Destailleur
c2cdb8be4f
Merge pull request #13486 from ptibogxiv/patch-318
NEW better filter on shipment list as other list
2020-04-03 02:52:31 +02:00
Laurent Destailleur
f65e5d19f6
Merge pull request #13485 from joseplluis/develop
NEW: add addlinktonotes in members list
2020-04-03 02:50:41 +02:00
Laurent Destailleur
237615aa71 Fix offset for ecuador must be ID of country so 84 + 5 zeros 2020-04-03 02:35:55 +02:00
Laurent Destailleur
b669aca1a0
Merge pull request #13483 from fabianpc/db_ecuador
NEW : Chart of accounts to Ecuador
2020-04-03 02:32:30 +02:00
Laurent Destailleur
193a10bc39 FIX cloning of emailing when no content selected 2020-04-03 02:29:10 +02:00
andreubisquerra
27eec2e5db
Travis fix 2020-04-02 23:28:25 +02:00
andreubisquerra
3255c18567
Receipt compatibility with receipt printer module 2020-04-02 22:11:16 +02:00
Laurent Destailleur
98d2db440a Complete tooltip 2020-04-02 21:34:51 +02:00
Laurent Destailleur
4c8a04cf38 Fix phpcs 2020-04-02 21:17:04 +02:00
ptibogxiv
84f0c216d1
Update list.php 2020-04-02 20:10:57 +02:00
stickler-ci
8b95e8a702 Fixing style errors. 2020-04-02 17:45:28 +00:00
ptibogxiv
67a1c3ea89
NEW better filter on shipment list as other list 2020-04-02 19:43:29 +02:00
Laurent Destailleur
644d83d799 Rename field to avoid confusion 2020-04-02 19:42:08 +02:00
Laurent Destailleur
733814a8a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-04-02 18:51:36 +02:00
Laurent Destailleur
7cee643c05 Prepare 10.0.8 2020-04-02 18:51:25 +02:00
Josep Lluís
d2e35fc1f7 NEW: add addlinktonotes in members list 2020-04-02 17:49:01 +02:00
Josep Lluís
a8755d51e5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2020-04-02 17:27:40 +02:00
Laurent Destailleur
f3d35b5a19 Fix phpcs 2020-04-02 17:06:57 +02:00
Laurent Destailleur
99ddd25ad5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-04-02 16:51:50 +02:00
Laurent Destailleur
19084286be Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	ChangeLog
	htdocs/fourn/class/fournisseur.product.class.php
2020-04-02 16:49:37 +02:00
Laurent Destailleur
7da01c3013 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-02 16:00:20 +02:00
Laurent Destailleur
3408f67348 Clean orhpelins in llx_product_association 2020-04-02 16:00:09 +02:00
Laurent Destailleur
d204cfe6c6 FIX Protection when database has a corrupted product id 2020-04-02 15:54:33 +02:00
Laurent Destailleur
b8c2dd6025 Look and feel v12 2020-04-02 15:11:46 +02:00
Frédéric FRANCE
a55d1fca0a
Update list.php 2020-04-02 14:33:49 +02:00
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