lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

1807 Commits

Author SHA1 Message Date
Florian Mortgat
3d69a1dc70 FIX 11.0 - multicurrency amount not fetched when fetching payments from llx_paiement or llx_paiementfourn 2020-06-17 11:06:31 +02:00
kamel
5bae9db0a8 FIX: Fix detect distached product and set to received completely when the supplier order have services (support STOCK_SUPPORTS_SERVICES) 2020-06-02 17:29:55 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
Laurent Destailleur
6056ed2755 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
 2020-05-24 01:02:08 +02:00
Laurent Destailleur
7bfbf3c88b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
 2020-05-23 20:20:53 +02:00
Laurent Destailleur
45ddde6940 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
 2020-05-23 20:18:10 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
f5688b2eec
add new rule 2020-05-21 01:52:25 +02:00
altairis
55def0248c fix missing rollbacks 2020-05-20 14:37:35 +02:00
Laurent Destailleur
c5e341883d Fix popup of supplier invoice 2020-05-19 23:22:40 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-05-02 01:39:56 +00:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23 2020-04-27 14:14:13 +02:00
Scrutinizer Auto-Fixer
1bf5745286 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-25 11:52:07 +00:00
Laurent Destailleur
6b114a31ce Look and feel v12 2020-04-25 03:00:41 +02:00
Laurent Destailleur
291664d109 Look and feel v12 2020-04-25 01:04:26 +02:00
Laurent Destailleur
3ed11f374a Look and feel v12 2020-04-24 23:56:57 +02:00
Laurent Destailleur
d416edab1a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-24 22:50:09 +02:00
Laurent Destailleur
54d641020f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/accounting-files.php
 2020-04-24 22:49:59 +02:00
Laurent Destailleur
d11dcc35c3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2020-04-24 19:56:19 +02:00
Laurent Destailleur
6798e9e6f5 Fix remove warning missing the seller in update_price 2020-04-24 19:52:54 +02:00
Laurent Destailleur
e84601f5ed
Merge pull request #13710 from TobiasSekan/FixMissingErrorOnCloneObject 
FIX not shown error on clone vendor invoice with ExtraFields
 2020-04-24 19:01:42 +02:00
Laurent Destailleur
7bbfd2175d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.dispatch.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/reception/class/reception.class.php
 2020-04-24 18:58:47 +02:00
Laurent Destailleur
9764af7e9c
Merge pull request #13731 from simicar29/11.0-reception 
Clean line extrafields when deleting reception
 2020-04-24 15:16:51 +02:00
stickler-ci
ababad540a Fixing style errors. 2020-04-23 17:29:52 +00:00
Marc Guenneugues
b4fbb86548 Clean line extrafields when deleting reception 2020-04-23 19:22:25 +02:00
Laurent Destailleur
7f0e019c78
Merge pull request #13725 from simicar29/11.0-supplierorder 
Clean line extrafields when deleting supplier order
 2020-04-23 18:56:09 +02:00
stickler-ci
4b58213e5b Fixing style errors. 2020-04-23 16:29:36 +00:00
Marc Guenneugues
64d877bc7b Clean line extrafields when deleting supplier order 2020-04-23 18:27:06 +02:00
stickler-ci
b5f48fb815 Fixing style errors. 2020-04-23 16:17:37 +00:00
Marc Guenneugues
039fe92209 Clean line extrafields when deleting supplier invoice 2020-04-23 18:14:56 +02:00
Laurent Destailleur
72c6ac1c72 Complete #13708, normalization of code 2020-04-23 13:21:39 +02:00
Laurent Destailleur
4475df14b4 Finish removal of duplicate hook/trigger 2020-04-23 12:54:28 +02:00
Sekan, Tobias
f793844862 Fix missing errror on facture clone 2020-04-23 11:04:14 +02:00
Frédéric FRANCE
8ed9c30a89
clean tab/whitespace 2020-04-22 09:02:02 +02:00
Laurent Destailleur
35b5ee28ef
Merge pull request #13680 from adrienjacob/patch-3 
Add API endpoints for supplier invoice lines
 2020-04-22 01:06:57 +02:00
Laurent Destailleur
ae519a1009
Update fournisseur.facture.class.php 2020-04-22 00:59:22 +02:00
stickler-ci
9f4d2ee881 Fixing style errors. 2020-04-21 14:11:33 +00:00
Adrien Jacob
23c2335396
Add API endpoints for supplier invoice lines 2020-04-21 16:07:49 +02:00
stickler-ci
d4a8718e6c Fixing style errors. 2020-04-21 08:00:14 +00:00
Adrien Jacob
5353082154
FIX Delete extra fields for supplier invoice line 2020-04-21 09:57:45 +02:00
stickler-ci
27aeaaecb5 Fixing style errors. 2020-04-20 14:42:13 +02:00
Adrien Jacob
91fbccb594 [BUGFIX] Allow update of extra fields 
This is to make supplier invoices consistent with other similar classes
 2020-04-20 14:42:08 +02:00
stickler-ci
36385e3b88 Fixing style errors. 2020-04-20 12:16:34 +00:00
Adrien Jacob
68702f8053
[BUGFIX] Allow update of extra fields 
This is to make supplier invoices consistent with other similar classes
 2020-04-20 14:12:08 +02:00
Laurent Destailleur
13eb1ca28d Fix link 2020-04-18 04:40:33 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00: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
atm-quentin
e3dfe60567 uniformize update buyprice + some fixes 2020-03-31 14:53:15 +02:00
ptibogxiv
497b0e4ecc
NEW filter by product on supplier order 
let's get the next replenishment date and order's informations on front-end for selected products
 2020-03-27 15:30:05 +01:00
Laurent Destailleur
20fad86520 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/cashcontrol/cashcontrol_card.php
 2020-03-26 00:14:06 +01:00
Laurent Destailleur
51f8c5ca87 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/commoninvoice.class.php
	htdocs/expensereport/list.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/product/fournisseurs.php
 2020-03-25 19:01:56 +01:00
Alexandre SPANGARO
5528e9ef38 Work on split module fournisseur 2020-03-24 22:02:58 +01:00
Laurent Destailleur
62fefab5ac Standardize color of status 2020-03-24 19:06:37 +01:00
Laurent Destailleur
ef86311639
Merge pull request #13224 from mapiolca/patch-38 
# Fix Compatibility with NOTMODIFYOTHERENTITYFOURNPRICE const.
 2020-03-22 20:32:15 +01:00
Laurent Destailleur
56d6c4691f FIX #13382 Note will be concat to private note 2020-03-18 21:06:36 +01:00
Laurent Destailleur
73f2e9e5de WIP migrate num_paiement into num_payment 
Fix label for free product in takepos
 2020-03-16 19:23:18 +01:00
Laurent Destailleur
3b72005f93 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/filefunc.inc.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/products.lang
	htdocs/langs/fr_FR/projects.lang
 2020-03-14 00:22:11 +01:00
stickler-ci
0babab2824 Fixing style errors. 2020-03-12 11:48:08 +00:00
simicar29
325d635c48
Load line extrafields when fetching supplier invoice 
PR to load extrafield values of lines when fetchinf supplier invoice.
 2020-03-12 12:43:06 +01:00
Laurent Destailleur
fc05e8d768 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/en_US/other.lang
 2020-03-11 18:03:15 +01:00
Laurent Destailleur
4903287204 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/boxes/box_commandes.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-03-11 17:04:28 +01:00
Laurent Destailleur
c9b715b7ad Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-11 17:01:31 +01:00
Laurent Destailleur
7afbb5ce9c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-03-11 17:00:01 +01:00
Laurent Destailleur
467dc2da7a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2020-03-11 16:59:35 +01:00
Laurent Destailleur
4bdf10c995 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2020-03-11 16:44:03 +01:00
atm-lena
20aa51f26b FIX - Clone Fourn Command, add line's extrafields Part 2 2020-03-11 15:26:49 +01:00
atm-lena
35f32391a0 FIX - Clone Fourn Command, add line's extrafields 2020-03-10 14:46:15 +01:00
Laurent Destailleur
7866f89585
Merge pull request #13260 from atm-quentin/FIX_ecm_files 
FIX ecm_files didnt match cause document ref contained "/"
 2020-03-03 23:09:02 +01:00
atm-quentin
9446138951 FIX ecm_files didnt match cause document ref contained "/" 2020-03-03 12:07:18 +01:00
Pierre Ardoin
74ac69fc5a
Add Entity in list_product_fournisseur_price() 
Select too the entity value to add const NOTMODIFYOTHERENTITYFOURNPRICE
 2020-02-27 09:16:15 +01:00
Laurent Destailleur
457d0668c8 Look and feel v12 2020-02-24 05:23:34 +01:00
Scrutinizer Auto-Fixer
e44865d8b5 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-21 16:53:37 +00:00
Laurent Destailleur
55bef402c4 Fix remove a lot of warnings on Eclipse 2020-02-21 17:47:36 +01:00
Laurent Destailleur
44eda2d4ad Fix doxygen 2020-02-20 13:42:43 +01:00
Laurent Destailleur
a4f13194c3
Merge pull request #12503 from atm-greg/New_Supplier_Packaging 
NEW Experiment supplier packaging with option PRODUCT_USE_SUPPLIER_PACKAGING: Using price according to the minimum quantity
 2020-02-13 10:50:56 +01:00
Laurent Destailleur
7f146111d2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-11 19:20:46 +01:00
Laurent Destailleur
aa9ffbba05 Fix missing fields property 2020-02-11 19:18:36 +01:00
Laurent Destailleur
74d3912763 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2020-02-11 16:52:58 +01:00
AdrianDominik
5432ab3b05 FIX: #13018 Extrafields Supplier invoice 2020-02-10 11:18:59 +01:00
atm-greg
f8ffdea5ae Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_Supplier_Packaging 2020-02-06 09:59:42 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
9acda3545e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:52:01 +01:00
Laurent Destailleur
c87fdc96ce Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/supplier/index.php
 2020-01-28 17:51:32 +01:00
Pierre Ardoin
e0c8fce229
Fix link direction for late supplier invoices 
Before : $response->url_late always == $response->url
After : if $response->nbtodolate >= 1 : $response->url_late redirects to list with only late unpaid supplier invoices.
 2020-01-27 09:39:38 +01:00
Laurent Destailleur
0f2141269a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-01-25 14:43:57 +01:00
Laurent Destailleur
09f809f347 FIX #12913 2020-01-25 14:03:24 +01:00
Laurent Destailleur
2d07a08e55 Fix init of specimen 2020-01-21 00:22:57 +01:00
Laurent Destailleur
80483fc085 Fix init of specimen 2020-01-21 00:20:03 +01:00
Laurent Destailleur
65fef47bdb Enable new pdf templates as stable 2020-01-20 01:05:30 +01:00
Laurent Destailleur
6fd717539d
Merge pull request #12887 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2020-01-18 20:21:29 +01:00
Scrutinizer Auto-Fixer
8744f6ab7b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-18 15:17:07 +00:00
Laurent Destailleur
0873f2fec9 Fix $user not defined 2020-01-18 16:16:17 +01:00
Laurent Destailleur
98eda68afb Fix linkg to public notes 2020-01-15 19:49:45 +01:00
Laurent Destailleur
38de69f5a9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/list.php
	htdocs/compta/bank/releve.php
	htdocs/compta/salaries/card.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/boxes.lang
	htdocs/langs/en_US/main.lang
	htdocs/product/class/product.class.php
	htdocs/product/reassort.php
	htdocs/product/stock/product.php
	htdocs/projet/element.php
 2020-01-04 14:20:25 +01:00
Pierre Tocquin
8a5f3d48f4
Update api_supplier_invoices.class.php 
Correction test data 'date'  lors de la création d'une facture fournisseur. `array_keys` remplacé par `array_key_exists` dans la clause `if`. Cette clause est correcte dans api_invoices.class.php.
 2020-01-03 19:18:24 +01:00
Laurent Destailleur
cc8f3f7258 Fix var not defined 2020-01-01 16:41:01 +01:00
Laurent Destailleur
9a08a6bf6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/traduction.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contact/card.php
	htdocs/core/modules/modSociete.class.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/langs/en_US/products.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
 2019-12-23 14:13:26 +01:00
Laurent Destailleur
4d12ecb072 FIX #12745 2019-12-23 13:40:35 +01:00
Laurent Destailleur
8059463941 Debug v11 2019-12-20 17:54:54 +01:00
Laurent Destailleur
3207add2a6 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/fourn/class/fournisseur.product.class.php
 2019-12-17 12:52:12 +01:00
Laurent Destailleur
60a0c18338
Merge pull request #12708 from atm-gauthier/10.0_fix_product_fourn_price_id 
FIX : product_fourn_price_id was assigned too late for logPrice() function
 2019-12-14 22:28:11 +01:00
Laurent Destailleur
2c4fd099c8
Update fournisseur.product.class.php 2019-12-14 22:27:45 +01:00
Laurent Destailleur
e9a0646f6f
Update fournisseur.product.class.php 2019-12-14 22:25:34 +01:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
 2019-12-14 14:53:49 +01:00
gauthier
cc1454c8d5 FIX : product_fourn_price_id was assigned too late for logPrice() function 2019-12-13 14:55:39 +01:00
Frédéric FRANCE
2136499c67
The variable $query seems to be never defined 2019-12-12 20:11:18 +01:00
gauthier
a0aa51fe0c FIX : CommandeFournisseurLigne update function must not be able to return other value than 1 if success 2019-12-12 16:46:25 +01:00
Frédéric FRANCE
e078bc6f83
doxygen 2019-12-10 08:08:56 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
stickler-ci
5d051cc901 Fixing style errors. 2019-11-25 07:08:22 +00:00
atm-greg
5af9784dc9 fix update line 2019-11-25 07:40:29 +01:00
atm-greg
89dd04aa07 implement on supplier_order 2019-11-23 19:05:49 +01:00
atm-greg
ce15af0980 manage packaging on supplier prices 2019-11-23 15:52:34 +01:00
Laurent Destailleur
1f5bea01f5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/product/fournisseurs.php
	htdocs/user/card.php
 2019-11-14 21:30:16 +01:00
Laurent Destailleur
7e52c70321 FIX Advisory ID: usd20190067 2019-11-14 21:16:18 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:15 +00:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 
Scrutinizer Auto-Fixes
 2019-11-14 08:50:24 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:39 +00:00
Laurent Destailleur
9e9d88f28c Fix stats on tickets 2019-11-05 16:06:08 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-11-03 21:48:24 +01:00
Laurent Destailleur
ab7c300f43 NEW Can change supplier when cloning a Purchase Order 2019-11-02 20:50:25 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid 
replace deprecated user->societe_id by user->socid
 2019-11-02 13:34:21 +01:00
Laurent Destailleur
58ffb73627 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-02 12:59:49 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019 
add comment
 2019-11-02 11:49:28 +01:00
Laurent Destailleur
7e6732c11b
Merge pull request #12263 from defrance/patch-144 
fix: delete function optional and id value
 2019-11-02 11:49:04 +01:00
Laurent Destailleur
68c971a2b5 All properties 'type_libelle' were renamed into 'type_label'. 2019-11-02 11:12:57 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-02 09:14:15 +01:00
Scrutinizer Auto-Fixer
50f55cac35 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-02 00:17:45 +00:00
Laurent Destailleur
cea2c3a9f4 Look and feel v11 2019-11-01 23:58:14 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
a1700e71be Fix phpcs 2019-10-31 21:18:38 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
f7747ed00a
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-30 20:06:43 +01:00
Philippe GRAND
ccb957623c add some comment 2019-10-30 10:00:52 +01:00
BENKE Charlene
1b7e138e01
fix: delete function optional and id value 2019-10-29 17:27:30 +01:00
Frédéric FRANCE
b2b057e9b5
clean indent 2019-10-27 09:51:15 +01:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-17 20:24:04 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Frédéric FRANCE
367ef4acaf
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-11 16:44:25 +02:00
Frédéric FRANCE
43c7917108
Update fournisseur.commande.class.php 2019-10-09 23:59:12 +02:00
Frédéric FRANCE
b78187c1eb
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 00:07:27 +02:00
Laurent Destailleur
1060ac4608
Merge pull request #12035 from atm-john/develop_fix_missing_dolgetstatus 
Fix : LibStatut missing dolgetstatus usage
 2019-10-07 13:08:33 +02:00
Frédéric FRANCE
6384e7eb67
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-05 20:02:16 +02:00
Laurent Destailleur
b883a8092a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/product.lib.php
	htdocs/core/tpl/extrafields_list_search_input.tpl.php
	htdocs/fourn/facture/card.php
	htdocs/product/class/html.formproduct.class.php
 2019-10-05 19:35:40 +02:00
ATM john
35c6008e1a Fix supplier order libStatus to use new dolGetStatus 2019-10-03 21:58:23 +02:00
Laurent Destailleur
1a66e0b05e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/product/card.php
 2019-10-03 17:53:59 +02:00
Laurent Destailleur
75be637b0b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-03 17:50:57 +02:00
Frédéric FRANCE
e443538f71
wip 2019-10-03 17:23:50 +02:00
atm-lena
ae01bd8f07 FIX missing begin() 2019-10-03 17:23:16 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
c0e7c558a1
Merge pull request #11860 from atm-john/new_box_supplier_orders_awaiting_reception 
NEW widget box for supplier orders awaiting reception
 2019-09-27 15:32:43 +02:00
Laurent Destailleur
72ea1a2867
Merge pull request #11927 from OPEN-DSI/fix-fournisseur-product-display-histo-tooltip 
FIX dol_print_date format in buying price tooltip
 2019-09-27 12:25:26 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Laurent Destailleur
5838fa1229 Fix az09 -> aZ09 2019-09-24 14:20:45 +02:00
Laurent Destailleur
6431e8e16d FIX SQL injection on qty 2019-09-24 12:43:44 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
VESSILLER
cf7193691f FIX dol_print_date format in buying price tooltip 2019-09-18 11:22:32 +02:00
ATM john
337194023a Add purchase orders awaiting reception to workboard 2019-09-10 22:10:20 +02:00
Laurent Destailleur
1d74387125 Removed deprecated property ->numero (We must use ->num_payment) 2019-09-09 08:47:23 +02:00
Laurent Destailleur
30d2f84eb7 Remove a label that is no more used 2019-09-07 10:58:20 +02:00
Laurent Destailleur
a481fac289
Merge pull request #11793 from altatof/supplierorderstatus 
Differentiate supplier orders status
 2019-09-07 10:54:03 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
80daf29d79 Fix conflict between new module reception and old process 
Fix inventory record does not need status at creation

Conflicts:
	htdocs/fourn/commande/card.php
 2019-09-06 01:55:22 +02:00
Laurent Destailleur
04adbd8c80 Fix conflict between new module reception and old process 
Fix inventory record does not need status at creation
 2019-09-06 01:52:51 +02:00
Laurent Destailleur
92e7d7bb26 Fix duplicate translation 2019-09-05 16:18:20 +02:00
Laurent Destailleur
f7ce723686
Merge pull request #11800 from jtraulle/fix-11427-10.0 
FIX #11427 require product class (fixes POST /supplierinvoices REST API endpoint)
 2019-09-03 12:56:00 +02:00
Jean Traullé
237c29d428
FIX #11427 require product class 
Fixes POST /supplierinvoices REST API endpoint
 2019-08-31 00:07:14 +02:00
Jean Traullé
c32c7d48ba
Fix Wrongly catched examples by Doxygen 2019-08-30 17:14:59 +02:00
Christophe Battarel
8c8844d7ae Differentiate supplier orders status 2019-08-30 09:33:01 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Laurent Destailleur
c93e6550ce Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:43:24 +02:00
Laurent Destailleur
dcfbba9af5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:41:06 +02:00
Laurent Destailleur
3f105a97bf Debug the new workboard 2019-08-18 04:56:48 +02:00
Laurent Destailleur
5351d78a96
Merge branch 'develop' into develop_new_dashboard 2019-08-18 01:26:56 +02:00
Laurent Destailleur
b8406f842d
Merge pull request #10655 from atm-quentin/FIX_credit_note_used_on_list 
Fix total on list and amount opened on thirdparty card (for supplier)
 2019-08-15 21:14:03 +02:00
Laurent Destailleur
7035bf88ca Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-15 19:52:01 +02:00
Laurent Destailleur
f1a63fd51b
Merge pull request #11684 from jtraulle/fix-rest-api-supplierinvoices-post-with-lines-fk_product 
FIX #11427 require product class (fixes POST /supplierinvoices REST API endpoint)
 2019-08-15 19:51:12 +02:00
Laurent Destailleur
f26a13ff13 NEW Removed deprecated code that create linked object from ->origin 2019-08-15 19:50:18 +02:00
Jean Traullé
c739b95666
Fix codestyle 
lessc.class.php should be excluded from ruleset as it is an external lib
 2019-08-14 23:33:06 +02:00
Jean Traullé
003642fe10
Preserve spaces instead of tabs for indentation. 2019-08-14 23:07:18 +02:00
Jean Traullé
1d2c2f8551
NEW Add payments GET and POST REST API endpoints for supplierinvoices. 2019-08-14 23:00:40 +02:00
Jean Traullé
b90815b972
FIX require product class (fixes POST /supplierinvoices REST API endpoint) 
When passing a fk_product field into a supplier invoice line on the POST /supplierinvoices REST API endpoint, we need to require the product class first in fournisseur.facture.class.php to be able to load the Product from the passed id.
 2019-08-13 16:36:41 +02:00
John Botella
b4c4e5a662 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard 2019-08-02 14:52:01 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-08-01 12:54:27 +02:00
John Botella
9b84987cc1 prepare new dashboard 2019-08-01 12:33:19 +02:00
Laurent Destailleur
5eb8f05061 FIX #11584 2019-08-01 12:23:02 +02:00
Laurent Destailleur
11e3aa5860 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 11:07:11 +02:00
Laurent Destailleur
7931f0b422 Fix sql error 2019-07-29 11:06:39 +02:00
Laurent Destailleur
a5e3adc6f1 Fix travis 2019-07-29 10:51:17 +02:00
Laurent Destailleur
db461792a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 01:36:35 +02:00
Laurent Destailleur
9a7113f4f5 FIX Update the file index table when we validate/rename a ref. 2019-07-28 22:26:55 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
3cffd70ed3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/prelevement/create.php
	htdocs/core/class/commonobject.class.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/fourn/product/list.php
	htdocs/opensurvey/index.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php
 2019-07-18 18:09:37 +02:00
Laurent Destailleur
b044d95acf Merge 2019-07-18 17:50:15 +02:00
Laurent Destailleur
f53f314211
Update fournisseur.product.class.php 2019-07-18 17:15:50 +02:00
Christophe Battarel
5daf0316f9 also fix bad insert sql command 2019-07-18 11:18:25 +02:00
Christophe Battarel
32bc8a5faf FIX fournrprice log for insert 2019-07-18 11:05:51 +02:00
gauthier
c72a59ad36 FIX : we need to be able to add freeline with qty between 0 & 1 in supplierorder line 2019-07-16 14:55:19 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Laurent Destailleur
51a1550dbb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2019-06-25 23:14:49 +02:00
Laurent Destailleur
a2d50eb95a Fix sql regression 2019-06-25 18:12:12 +02:00
Laurent Destailleur
0c3f524319 Clean code 2019-06-25 16:12:16 +02:00
Laurent Destailleur
f6719db4f3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-25 16:09:08 +02:00
Laurent Destailleur
a98ceb584d Fix syntax error 2019-06-25 16:08:01 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
1c924ef17e Fix bad label on supplier invoice 2019-06-25 12:54:02 +02:00
Laurent Destailleur
8cc6c18931 Fix bad label on supplier invoice 2019-06-25 12:53:23 +02:00
Laurent Destailleur
3c6d271c67 Removed deprecated fields 2019-06-25 12:42:36 +02:00
Laurent Destailleur
1a6dc83d4c Fix: default accounting account for eec and export sales were not used. 2019-06-20 12:25:58 +02:00
Laurent Destailleur
078324811b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2019-06-20 03:43:16 +02:00
Laurent Destailleur
4574ad2eeb Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-20 03:39:48 +02:00
Laurent Destailleur
53688e2d0f
Merge pull request #11353 from fmarcet/8.0 
FIX: Wrong stock movement on supplier credit notes
 2019-06-20 03:11:28 +02:00
gauthier
3ad13adf31 FIX : better syntax 2019-06-19 10:43:42 +02:00
gauthier
7331e43db8 FIX : we need to fetch fourn invoice with ref in current entity 2019-06-19 10:19:33 +02:00
Ferran Marcet
c62f370959 FIX: Wrong stock movement on supplier credit notes 2019-06-17 16:30:56 +02:00
Laurent Destailleur
ff1adb3934 Fix dead code 2019-06-13 22:11:25 +02:00
Francis Appels
a26c868783 Fix scrutinizer bugs 2019-06-12 22:05:10 +02:00
Laurent Destailleur
49646663a1 Fix link on invoice 2019-06-07 22:47:15 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Francis Appels
a2d4a59321 Merge branch 'develop' into clean_10_beta 2019-05-13 21:27:13 +02:00
Laurent Destailleur
1c558c685c Fix class not found 2019-05-09 17:16:35 +02:00
Rüdiger Hahn
acb2f59f56
Fetch db value for cond_reglement_doc/cond_reglement_libelle_doc 
cond_reglement and cond_reglement_doc got the same value cond_reglement_libelle. It looks like that the db field libelle_facture was intended to be used for cond_reglement_libelle_doc.
 2019-05-06 19:22:49 +02:00
Francis Appels
18c5c586ab Cleanup set_draft in syslog 2019-05-01 09:38:27 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All 
methods requires the object User as first parameter.
 2019-04-25 12:11:32 +02:00
Laurent Destailleur
cf058e7d3b NEW Ask date of invoice when using the Clone feature. 2019-04-12 12:12:08 +02:00
atm-quentin
7ae6472e36 Merge branch '8.0' of github.com:Dolibarr/dolibarr into FIX_credit_note_used_on_list 2019-04-12 09:20:16 +02:00
Laurent Destailleur
fff9b7db9d Fix doxygen 2019-04-04 18:33:12 +02:00
Laurent Destailleur
5891d0a056 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/list.php
	htdocs/projet/list.php
 2019-04-04 17:45:02 +02:00
Ion
7bfa49b29c FIX: Disallow line start date > end date 2019-03-24 14:30:00 +01:00
Laurent Destailleur
ee4150665e Fix phpcs 2019-03-21 20:15:19 +01:00
Laurent Destailleur
5693fbfe97
Merge pull request #10898 from grandoc/new_branch_21_03_2019 
add some comments
 2019-03-21 18:29:11 +01:00
Laurent Destailleur
90df30e412 NEW Add trigget FICHINTER_UNVALIDATE 
Standardize code of setDraft.
 2019-03-21 17:37:56 +01:00
Philippe GRAND
6babf88968 add some comments 2019-03-21 15:11:28 +01:00
Frédéric FRANCE
2fddf38da1
correct replacement of align 2019-03-19 12:55:33 +01:00
Laurent Destailleur
9a3c66b057
Merge pull request #10846 from grandoc/new_branch_15_03_2019 
New branch 15 03 2019
 2019-03-19 12:13:02 +01:00
Philippe GRAND
c13a1dbc63 translation 2019-03-18 13:45:24 +01:00
Philippe GRAND
0f03b16313 translation 2019-03-18 12:46:32 +01:00
Laurent Destailleur
f3cf3482fa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/projet/element.php
 2019-03-18 10:23:14 +01:00
Laurent Destailleur
34034787af FIX problem with sign of various payment in project preview 2019-03-18 10:16:08 +01:00
Philippe Grand
8054f61bac
Update fournisseur.product.class.php 
Oops...to much alcohol..
 2019-03-16 09:14:57 +01:00
Laurent Destailleur
c0b6699b25 All methods set_draft() were renamed into setDraft() 2019-03-15 19:01:40 +01:00
Laurent Destailleur
a2d6723ff3 WIP Link files to expense report lines 2019-03-15 15:07:52 +01:00
Philippe GRAND
2463ee47ba update with html5 compliant code 2019-03-15 09:40:52 +01:00
Laurent Destailleur
86c5dc20e3 NEW Can choose the root category to show for TakePOS module 2019-03-15 02:12:40 +01:00
Laurent Destailleur
2713c430df
Merge branch 'develop' into dev_datepricefour 2019-03-14 18:43:09 +01:00
Laurent Destailleur
463c83efec
Update fournisseur.product.class.php 2019-03-14 18:37:03 +01:00
Laurent Destailleur
8f65ee2296
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode 2019-03-14 17:48:44 +01:00
Laurent Destailleur
60db66d2bf
Update fournisseur.product.class.php 2019-03-14 17:41:33 +01:00
Laurent Destailleur
250e0bbaac
Update fournisseur.product.class.php 2019-03-14 17:40:39 +01:00
Laurent Destailleur
dd962fa044
Update fournisseur.product.class.php 2019-03-14 17:39:01 +01:00
Laurent Destailleur
233bd4374a Fix phpcs 2019-03-08 19:52:26 +01:00
Laurent Destailleur
ddc52b7199 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/exports/export.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2019-03-07 14:13:38 +01:00
Laurent Destailleur
0729a3b571 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-07 14:11:12 +01:00
Laurent Destailleur
9a9fd15077 Fix doxygen 2019-03-07 14:10:33 +01:00
Laurent Destailleur
02b8bc94e7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-07 14:06:31 +01:00
Laurent Destailleur
d2f1d0cc33 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2019-03-07 14:06:11 +01:00
Laurent Destailleur
e3fb228a4d
Update fournisseur.facture.class.php 2019-03-07 12:28:19 +01:00
gauthier
0ff2905180 FIX : we need to keep originline special_code 2019-03-06 12:10:24 +01:00
Frédéric FRANCE
f283782445
change visibility 2019-03-04 19:57:46 +01:00
Frédéric FRANCE
014f69850e
add visibility 2019-03-01 23:08:57 +01:00
Frédéric FRANCE
0022c4fe72
add visibility 2019-02-28 22:44:12 +01:00
atm-quentin
394659f84a missing doc 2019-02-27 09:22:47 +01:00
atm-quentin
f51b89def3 NEW supplier buyprice barcode 2019-02-27 09:22:34 +01:00
Frédéric FRANCE
e6c3eb0ba1
wip 2019-02-26 21:13:07 +01:00
Laurent Destailleur
6b46a927f1
Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket 2019-02-24 20:53:54 +01:00
Laurent Destailleur
7b2f4771f0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-24 20:30:21 +01:00
Laurent Destailleur
5e6797f39d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-24 20:28:18 +01:00
Laurent Destailleur
2f300ae63f Standardize code with customer invoices 2019-02-24 20:26:54 +01:00
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket 2019-02-24 20:06:55 +01:00
atm-quentin
b6deda1111 FIX credit note used on list 2019-02-18 12:28:18 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
atm-greg
4624f1b1b8 FIX positive values creating diff on addline rounding 2019-02-06 17:19:16 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Laurent Destailleur
af9e2d07d2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/paiement.php
	htdocs/fourn/facture/paiement.php
 2019-02-03 20:38:47 +01:00
Laurent Destailleur
4b77b3ff23 NEW Support tag {ccc} on payment ref 2019-02-03 20:36:20 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
Laurent Destailleur
3fc49a9de2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-01 16:07:27 +01:00
Laurent Destailleur
6de732d7f8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/facture/mod_facture_mars.php
	htdocs/core/modules/facture/mod_facture_terre.php
 2019-02-01 16:07:18 +01:00
Laurent Destailleur
35f65a571c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/modules/facture/mod_facture_mars.php
	htdocs/core/modules/facture/mod_facture_terre.php
	htdocs/fourn/commande/list.php
 2019-02-01 16:05:43 +01:00
Laurent Destailleur
dee2a373c1 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2019-02-01 16:01:18 +01:00
Laurent Destailleur
452dfafd32 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-02-01 15:56:47 +01:00
Francis Appels
cf9d87df4a Fix travis 2019-02-01 15:40:56 +01:00
Francis Appels
c4915c679a Merge develop 2019-02-01 11:47:03 +01:00
Francis Appels
2c5623c53e check if price already logged, if not first log current price 2019-02-01 11:37:46 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
408609e0ec Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2019-01-30 16:54:38 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Laurent Destailleur
17c3337c9b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-30 15:25:43 +01:00
Regis Houssin
39b696af02 FIX multicompany compatibility 2019-01-29 12:01:40 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
John BOTELLA
9a666b265f Use an other test 2019-01-28 11:53:19 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Laurent Destailleur
d4daa6cebd
Merge pull request #10430 from frederic34/patch-18 
typo in fournisseur.product.class.php
 2019-01-27 17:51:49 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
0e3efadf59
typo in fournisseur.product.class.php 2019-01-27 14:37:37 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
4a5d260db5
Update fournisseur.product.class.php 2019-01-26 14:07:37 +01:00
John BOTELLA
15e1d3b456 Fix fetch test 2019-01-24 09:40:58 +01:00
Francis Appels
1d08ccef07 Fix sql error 2019-01-22 16:39:54 +01:00
Francis Appels
7ad48064be Add code to show in fourn price tooltip. 2019-01-22 16:18:25 +01:00
Francis Appels
946c017937 Fix and clean price log. Key should price id iso product id. 2019-01-22 15:59:47 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime 
Fix
 2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Laurent Destailleur
b4a6311f64 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-10 01:48:04 +01:00
Laurent Destailleur
057b606663 Fix tooltip 2019-01-09 15:03:44 +01:00
Laurent Destailleur
fbd490da15 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-09 13:29:47 +01:00
Laurent Destailleur
d1e062cafa FIX When changing date of payment, change also record in bank if not 
conciliated yet.
 2019-01-09 13:28:12 +01:00
Laurent Destailleur
d9999d61f6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-09 12:27:25 +01:00
Laurent Destailleur
890abd28d5 Fix look and feel v9 2019-01-09 12:26:49 +01:00
Laurent Destailleur
3d30d8513f Fix phpcs 2018-12-16 20:36:22 +01:00
Laurent Destailleur
f55db6dd84 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/resources/dbmodel/dolibarr_schema.mwb
 2018-12-15 14:09:16 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
5dabefe227 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-13 20:49:55 +01:00
Laurent Destailleur
6ad106d14a
Update fournisseur.facture.class.php 2018-12-13 19:56:22 +01:00
atm-quentin
3da9650003 FIX if qty is 0 2018-12-10 16:06:11 +01:00
Laurent Destailleur
138640fc63 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-12-04 14:58:11 +01:00
Laurent Destailleur
8e333c3feb Standardize code 2018-12-04 14:54:58 +01:00
Laurent Destailleur
d80baaea69 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2018-12-04 14:29:47 +01:00
Ferran Marcet
7247b14bd9 FIX Lines are not inserted correctly if VAT have code 2018-12-03 12:28:17 +01:00
Ferran Marcet
135a94dfed Merge branch '7.0up' into 7.0 2018-12-03 11:59:46 +01:00
Ferran Marcet
8312d57d16 FIX Lines are not inserted correctly if VAT have code 2018-12-03 11:58:39 +01:00
Frédéric FRANCE
9692e98acf
Update fournisseur.facture.class.php 2018-12-01 22:49:12 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
Maxime Kohlhaas
e8a02a971d Fix #9074 2018-11-30 23:05:12 +01:00
Frédéric FRANCE
2e4ec1ed10
Update fournisseur.commande.class.php 2018-11-19 23:56:20 +01:00
Laurent Destailleur
2f87ee6640 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-19 15:56:38 +01:00
Laurent Destailleur
f85ab8d0a6 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/card.php
 2018-11-19 15:55:41 +01:00
tarrsalah
5eb897e049 FIX sql query performance on list_qualified_avoir_supplier_invoices. 2018-11-12 12:11:40 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
f1193ad3dd FIX: Missing date creation and modification of supplier price 2018-11-09 10:29:22 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Laurent Destailleur
2c3cd7a668 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modSyslog.class.php
 2018-10-30 15:32:09 +01:00
Laurent Destailleur
4dca94480e
Merge pull request #9892 from atm-maxime/fix_supp_inv_clone 
Fix invoice supplier clone was not getting all lines parameters #9800
 2018-10-30 14:59:48 +01:00
Laurent Destailleur
76c3bac777
Merge pull request #9900 from frederic34/patch-21 
use strict compare
 2018-10-30 14:23:14 +01:00
Laurent Destailleur
a16e7a84e9
Merge pull request #9899 from frederic34/patch-20 
use strict compare
 2018-10-30 14:23:01 +01:00
John BOTELLA
ca47d1b8b1 Fix clone fourn order and invoice lines special code 2018-10-30 10:26:59 +01:00
Frédéric FRANCE
d7507ac858
use strict compare 2018-10-27 21:00:59 +02:00
Frédéric FRANCE
84219039a2
use strict compare 2018-10-27 20:57:59 +02:00
Frédéric FRANCE
e1625990f2
use strict compare 2018-10-27 20:54:53 +02:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Maxime Kohlhaas
4ec80b5136 Fix invoice supplier clone was not getting all lines parameters #9800 2018-10-27 10:53:01 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
atm-quentin
04eb9ca167 fix dont change num version 2018-10-23 17:06:21 +02:00
atm-quentin
96d0bb8f2e FIX adapt develop 2018-10-23 14:31:58 +02:00
atm-quentin
8442b405b2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception 2018-10-23 10:27:46 +02:00
atm-quentin
cfff4c7df8 NEW add ref supplier on supplier invoice 2018-10-22 14:32:50 +02:00
atm-quentin
dd0a57d39e FIX pdf for creating invoice without massaction 2018-10-17 15:36:47 +02:00
atm-quentin
236a61ab55 new manage correctly create bills on reception 2018-10-17 11:56:32 +02:00
atm-quentin
aaace60b0d FIX stock movement on close reception and set status if too much receive$ 2018-10-10 15:33:35 +02:00
Philippe GRAND
9b6367c1ee Standardize and update code 2018-10-10 12:16:20 +02:00
atm-quentin
c6ab79bad3 NEW note, contact and lines on card 2018-10-08 16:54:33 +02:00
atm-quentin
6a8092dfae NEW entete reception card 2018-10-05 16:21:50 +02:00
Philippe GRAND
073ec85208 Standardize code 2018-10-05 15:51:08 +02:00
atm-quentin
752c35d6d1 addline presque fini 2018-10-04 17:32:50 +02:00
atm-quentin
5fe767d7bd debut card create 2018-10-04 12:27:10 +02:00
Frédéric FRANCE
dae2757b73
remove useless phpcs:disable 2018-10-02 20:39:44 +02:00
Philippe GRAND
574cfad48f Standardize and update code 2018-09-28 14:49:34 +02:00
Laurent Destailleur
d6ee00f2e7 Fix constructors does not need return value 2018-09-16 10:22:23 +02:00
Frédéric FRANCE
fafa7f18b1
reduce complexity libstatut fournisseur.commande;class.php 2018-09-15 22:24:57 +02:00
Frédéric FRANCE
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 18:32:15 +02:00
Laurent Destailleur
fcabe67e4b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 13:30:28 +02:00
Maxime Kohlhaas
a5f4a74ecc FIX : Homepage links were using wrong topmenus 2018-09-06 14:49:48 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Frédéric FRANCE
fd6281b364
move phpcs:ignore 2018-09-04 20:00:09 +02:00
Frédéric FRANCE
5f4a922c1d
move phpcs:ignore 2018-09-03 19:00:37 +02:00
Frédéric FRANCE
2a9ef8dc05
move phpcs:ignore 2018-09-02 22:05:19 +02:00
Frédéric FRANCE
35232b753a
move phpcs:ignore 2018-09-02 20:37:12 +02:00
Philippe GRAND
3de16a145e Standardize and update code 2018-09-02 11:08:41 +02:00
Philippe GRAND
db32d8903e Standardize and Update code 2018-09-01 23:20:20 +02:00
Philippe GRAND
7b0d3c32ab Standardize and Update code 2018-09-01 22:55:10 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Philippe GRAND
45cbc36a15 Standardize and update code 2018-09-01 15:27:55 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Philippe GRAND
1944ef0dc3 conflict resolution 2018-09-01 12:38:22 +02:00
Philippe GRAND
bb05e80a87 Standardize and update code 2018-08-31 18:47:25 +02:00
Philippe GRAND
9e880d3e72 Standardize and update code 2018-08-31 17:55:31 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-29 18:45:36 +02:00
Laurent Destailleur
86d8513138
Merge pull request #9309 from frederic34/trimtrailing2 
last trimtrailing
 2018-08-29 17:57:05 +02:00
Laurent Destailleur
7bf48b8d77 Fix date_start and date_end not saved on supplier invoice 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2018-08-29 17:26:41 +02:00
Laurent Destailleur
98356c6ed0 Fix date_start and date_end not saved on supplier invoice 2018-08-29 17:03:18 +02:00
Frédéric FRANCE
0e512cbc36
Merge remote-tracking branch 'upstream/develop' into trimtrailing2 2018-08-29 15:47:55 +02:00
Laurent Destailleur
ee204e2e64 Fix regression in php style 2018-08-29 15:37:35 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Frédéric FRANCE
1182f29864
trimtrailing 2018-08-28 08:33:02 +02:00
Philippe GRAND
87067b2bc9 Standardize and update code 2018-08-23 18:35:45 +02:00
Philippe GRAND
74ce0bfea6 Standardize and update code 2018-08-23 16:54:24 +02:00
Philippe GRAND
80b7229174 Standardize and update code 2018-08-23 11:34:55 +02:00
Philippe GRAND
9e900e583d Merge branch 'new_branch_21_08_2018' of github.com:grandoc/dolibarr into new_branch_21_08_2018 2018-08-23 11:13:54 +02:00
Philippe GRAND
aafa16afa5 Update and standardize code 2018-08-23 11:11:46 +02:00
Philippe Grand
b817517997
Update fournisseur.product.class.php 2018-08-23 10:08:17 +02:00
Philippe Grand
0e3c9ffd51
Update fournisseur.facture.class.php 2018-08-23 10:05:02 +02:00
Philippe GRAND
0c75c41e7b Update and standardize code 2018-08-22 19:56:24 +02:00
Philippe GRAND
06da7f54a2 Update and standardize code 2018-08-22 18:48:53 +02:00
Philippe GRAND
0ffad50974 Update and standardize code 2018-08-22 11:24:31 +02:00
Philippe GRAND
a36061079b Update and standardize code 2018-08-22 11:11:59 +02:00
Philippe GRAND
a669830427 Update and standardize code 2018-08-22 10:37:16 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Frédéric FRANCE
69a7af88e7
function declaration 2018-08-15 18:14:02 +02:00
Frédéric FRANCE
d30874750f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-14 09:02:12 +02:00
delcroix Patrick
3b9266060c Fix #9205 quote in Label/number on supplier payment 
# Fix #9205 #9205
the num_paiement wasn't escaped, not sure it's an real issue but it was reported here
https://www.dolibarr.fr/forum/8-mise-a-jour/62340-message-erreur-suite-mise-a-jour#99408
 2018-08-13 23:42:18 +02:00
delcroix Patrick
cbdd1949df
Fix #9205 quote in Label/number on supplier payment 
# Fix #9205 #9205
the num_paiement wasn't escaped, not sure it's an real issue but it was reported here
https://www.dolibarr.fr/forum/8-mise-a-jour/62340-message-erreur-suite-mise-a-jour#99408
 2018-08-13 20:39:20 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Laurent Destailleur
1b20d6feab
Merge pull request #9214 from atm-greg/Add_supplier_product_description 
NEW Can record the supplier product description
 2018-08-12 18:56:27 +02:00
Frédéric FRANCE
79aaddbb66
test phpcs v3 2018-08-09 14:46:00 +02:00
atm-greg
ad5f59822e Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description 2018-08-07 09:33:30 +02:00
atm-greg
fc705e8510 Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description 2018-08-07 09:31:41 +02:00
atm-greg
c1de7fe8ac fix update_buyprice 2018-08-07 09:15:30 +02:00
atm-greg
a8b33a1710 New fields desc_supplier on product_fourn_prices 2018-08-06 16:26:25 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Regis Houssin
e8afd7e833 Fix: use "supplier" instead "reseller" 2018-07-07 08:48:26 +02:00
Regis Houssin
1522a5b22d Fix: differentiate customer prices from supplier prices sharing 2018-07-07 08:43:59 +02:00
Laurent Destailleur
07c514b85c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/projet/class/projectstats.class.php
 2018-06-20 21:56:10 +02:00
Laurent Destailleur
9f2437fa04 Fix missing field 2018-06-20 17:59:01 +02:00
Laurent Destailleur
9d048281dc
Merge pull request #8970 from inoveaconseil/FixParamGenerateDocument 
Fix missing params on generateDocument
 2018-06-18 11:14:49 +02:00
Laurent Destailleur
4898f10fa2 FIX Adding a product with no supplier price defined yet 2018-06-16 13:49:28 +02:00
Inovea Conseil
d5a3e63e05 Fix missing paramater for generateDocument 2018-06-15 09:47:28 +02:00
Laurent Destailleur
910652eb6d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
 2018-06-13 23:07:30 +02:00
Laurent Destailleur
4c2af6fc70 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/html.form.class.php
 2018-06-13 23:04:08 +02:00
altatof
d42f00bca9 FIX : pu_ht_devise was not converted to numeric so decimals were lost 
when clculating total_ht_devise
 2018-06-13 16:35:52 +02:00
Laurent Destailleur
de59892438 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-05-30 12:13:18 +02:00
Laurent Destailleur
0412264418 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-05-30 12:05:54 +02:00
Laurent Destailleur
60321aabd8 Fix regression 2018-05-30 11:59:23 +02:00
Laurent Destailleur
3733169120 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/recap-compta.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-05-30 11:09:53 +02:00
Laurent Destailleur
e57ceab5de
Update fournisseur.commande.class.php 2018-05-30 10:45:06 +02:00
ATM-Nicolas
6b0b975ffd FIX : Keep supplier proposal price for supplier order 2018-05-29 11:21:30 +02:00
jean
eb39e5746e Merge remote-tracking branch 'origin/develop' into dev_datepricefour 2018-05-25 15:32:15 +02:00
Laurent Destailleur
f58e0d3bcf Fix scrutinizer errors 2018-05-23 08:24:20 +02:00
jean
1ab5eece6b Adding code to show update date of supplier price shown 2018-05-22 09:40:49 +02:00
Laurent Destailleur
ef395fc36b Fix scrutinizer bugs 2018-05-16 15:23:52 +02:00
Laurent Destailleur
9c68b81f59 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/admin/account.php
	htdocs/projet/class/task.class.php
 2018-05-05 14:34:54 +02:00
atm-greg
942e2f40bf addline manage rank on its own if not provided 2018-05-02 17:07:27 +02:00
Laurent Destailleur
e5df7e206b
Merge pull request #8224 from atm-ph/fix_6.0_supplier_order_from_supplier_proposal 
Fix wrong price on supplier order line
 2018-04-27 12:20:49 +02:00
Laurent Destailleur
d179cafa9c
Update fournisseur.commande.class.php 2018-04-27 12:19:32 +02:00
Laurent Destailleur
ecd84f6c45
Update fournisseur.commande.class.php 2018-04-27 12:18:45 +02:00
Laurent Destailleur
1cbf5f1c5e
Merge pull request #8687 from dolibarr95/patch-43 
NEW : Allow negative quantity for dispatch (supplier order)
 2018-04-27 11:41:05 +02:00
Laurent Destailleur
0a4bd14bc3
Merge pull request #8678 from defrance/patch-111 
add $user on delete line
 2018-04-27 10:31:19 +02:00
Laurent Destailleur
59e5545aa7 Fix phpunit 2018-04-27 09:18:25 +02:00
dolibarr95
14e68ea8f9
Allow qty to be negative 2018-04-26 16:42:08 +02:00
BENKE Charlene
c879232fd7
add $user on delete line 
possible to hamonize the call function for all line->delete ?
 2018-04-24 23:41:12 +02:00
Laurent Destailleur
5eb7c7ffff FIX Edit of ref_supplier in supplier invoice 2018-04-24 13:22:34 +02:00
Laurent Destailleur
9d070cac87 NEW Can add product in supplier order/invoice even w/o predefined price 
Add option SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY,
SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY and
SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY to restore restricted old
behaviour.
 2018-04-24 12:57:31 +02:00
Laurent Destailleur
06e51703b1 Clean constructors 2018-04-21 16:01:05 +02:00
Laurent Destailleur
912d5c53f2 Standardize code 2018-04-21 15:54:05 +02:00
Laurent Destailleur
411949a6bb Optimize constructors 2018-04-21 15:08:46 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
2959dc4a3a Fix regression 2018-04-15 18:20:04 +02:00
florian HENRY
ad403c7045 fix syntax and uniformize code 2018-04-14 17:04:38 +02:00
Laurent Destailleur
b4ef3945d2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/facture/card.php
 2018-04-13 23:52:08 +02:00
Laurent Destailleur
6a3c2f9808 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/fourn/facture/card.php
 2018-04-13 23:27:14 +02:00
Laurent Destailleur
c25e21de4b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-13 23:19:22 +02:00
Laurent Destailleur
8cfcdabcac Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-04-13 23:03:46 +02:00
atm-greg
8d4126274a rang was missing on order_supplier lines 2018-04-13 15:53:49 +02:00
atm-greg
ef2c6a0ed4 fix sql error 2018-04-13 10:31:36 +02:00
atm-greg
58535993c1 use special_code on order_supplier lines 2018-04-13 10:31:27 +02:00
Laurent Destailleur
3078b890d4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/stripe/admin/stripe.php
 2018-04-13 00:45:39 +02:00
Laurent Destailleur
f7bb781b42 FIX #8571 2018-04-13 00:43:15 +02:00
Laurent Destailleur
7108f68db9 Remove old deprecated hook insertExtraFields. Triggers must be used for 
action on CRUD events.
 2018-04-10 12:03:01 +02:00
Laurent Destailleur
9e89675862 Fix creation of supplier invoice 2018-04-06 20:34:12 +02:00
François J
a78c064461 Fix CommandeFournisseur::getDispachedLines line ID & return quantity 2018-04-06 11:22:15 +02:00
François J
041a21e829 Add tag @since 2018-04-04 14:05:50 +02:00
François J
9b61272bb7 Fix CommandeFournisseur::getDispachedLines line ID & return quantity 2018-04-04 12:32:49 +02:00
Laurent Destailleur
64f21b8a3c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2018-03-11 00:10:13 +01:00
Maxime Kohlhaas
d82c62b638 Fix supplier order clone was keeping objectlinked 2018-03-09 21:51:59 +01:00
atm-ph
53ce297ab3 Fix travis - missing documentation of new param 2018-03-09 09:30:11 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm 
NEW: supplier credit notes & discounts (absolute and relative)
 2018-03-08 20:06:37 +01:00
Regis Houssin
93a9430e49 Fix: regression, restore primary key 2018-03-08 07:41:54 +01:00
Laurent Destailleur
cf45f78d7e
Merge pull request #8218 from OPEN-DSI/product_supplier_buyprice_multicurrency 
NEW Add multicurrency support for product buy price for supplier propales, orders and invoices
 2018-03-07 13:12:23 +01:00
atm-ph
5971cd8e59 Fix label goes in desc and lost fourn ref 2018-03-05 17:18:03 +01:00
atm-ph
ebb4da8417 Fix keep supplier proposal price in supplier order 2018-03-05 16:58:35 +01:00
Marc de Lima Lucio
7cd1b2caa9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-02-27 16:45:01 +01:00
Marc de Lima Lucio
239e834913 FIX: supplier credit notes: remove handled TODO 2018-02-27 10:04:02 +01:00
Laurent Destailleur
de89893d57 NEW Show total of time consumed in week in time spent entry page 2018-02-26 14:09:56 +01:00
kkhelifa-opendsi
90f4c985f6
Merge branch 'develop' into product_supplier_buyprice_multicurrency 2018-02-26 09:54:09 +01:00
Laurent Destailleur
003827eb06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-25 15:01:19 +01:00
Laurent Destailleur
b52a2b12a5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-25 14:44:49 +01:00
Laurent Destailleur
2cd5ed65a6 Clean deprecated (field unit_charge in supplier price) 2018-02-25 14:13:09 +01:00
Regis Houssin
703d976b3b Fix: missing object entity in fetch 2018-02-24 16:21:16 +01:00
KHELIFA
54dba24ab5 Add multicurrency support for product buy price for supplier propales, orders and invoices 2018-02-23 11:06:07 +01:00
dolibarr95
6793d826b7
Dispatch if more than ordered 
If the constant SUPPLIER_ORDER_MORE_THAN_WISHED is set
 2018-02-23 10:14:54 +01:00
Laurent Destailleur
c4130730cb Clean code around fetch_optionals() 2018-02-20 19:38:18 +01:00
Laurent Destailleur
809ef1bd00 FIX Trigger *_MODIFY must be called when editing a property event extra. 
Clean duplicate trigggers "*_CLONE"
 2018-02-20 18:09:38 +01:00
Marc de Lima Lucio
57b8df4008 FIX: supplier credit notes: delete discount when deleting linked invoice/invoice line 2018-02-19 17:32:11 +01:00
Marc de Lima Lucio
f5ad93b272 NEW: supplier credit notes: handle Excess Paid + translation 2018-02-19 15:52:07 +01:00
Marc de Lima Lucio
e2b65b3755 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note 2018-02-16 09:14:53 +01:00
Marc de Lima Lucio
daca27b2ed NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring 2018-02-14 18:02:40 +01:00
Laurent Destailleur
536eb7e008 Fix label of invoice 2018-02-14 17:25:13 +01:00
Marc de Lima Lucio
4f9bb33600 NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid 2018-02-14 10:47:10 +01:00
Laurent Destailleur
d3a6342034 Fix regeneration of PDF after creation of payment. 2018-02-02 10:37:10 +01:00
Laurent Destailleur
e79f6fda2b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-26 01:23:18 +01:00
Laurent Destailleur
2c0eeaf8de FIX #8093 2018-01-25 20:57:51 +01:00