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

953 Commits

Author SHA1 Message Date
atm-ph
5dfb988cb1 Fix 6944 compatibility PHP7 and missing parameter to call delete function 2017-06-10 13:34:28 +02:00
Regis Houssin
fa58f0f3e8 Fix: add entity filter 2017-06-09 09:25:15 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Maxime Kohlhaas
6ac08c3bee Fix : Product supplier price is related to supplier's currency 2017-05-29 10:32:17 +02:00
Laurent Destailleur
f5e29d6c86 Fix phpcs warning 2017-05-22 10:45:02 +02:00
Laurent Destailleur
e2a7b0943f Clean dead code 2017-05-17 14:52:27 +02:00
Laurent Destailleur
fa290c34fa Fix against SQL injection. Add phpunit to detect missing escapement. 2017-05-12 16:55:11 +02:00
Benoit
23af50ad2a Add fk_facture_fourn element to fetch lines objects 2017-05-10 22:45:41 +02:00
Benoit
0fbf27895a Add fk_facture_fourn element to fetch lines objects 2017-05-05 22:33:34 +02:00
Laurent Destailleur
11b1a2adac Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/comm/propal/class/api_proposals.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/bank/index.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
	htdocs/includes/odtphp/Segment.php
	htdocs/langs/en_US/admin.lang
	htdocs/societe/soc.php
 2017-05-05 14:49:25 +02:00
Laurent Destailleur
2120b9af85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/theme/eldy/style.css.php
 2017-05-05 14:14:21 +02:00
Laurent Destailleur
8a37eeea74 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-05-05 14:02:02 +02:00
Guillaume T. (Arck Consulting)
ef0d395a1a [FIX] Credit Note for fourn doesn't work, missing filed in create method & attribut 2017-05-05 09:49:44 +02:00
Laurent Destailleur
ce05c74e47 NEW SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT 2017-05-04 17:48:52 +02:00
Laurent Destailleur
ea58fb0b50 Fix triggered error 2017-05-04 15:52:12 +02:00
Marc de Lima Lucio
56e749df9f FIX: supplier order line were always created with rang = 0 2017-04-26 16:12:27 +02:00
Laurent Destailleur
4c056d68d8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/commande/list.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/bills.lang
	htdocs/societe/list.php
 2017-04-15 17:02:05 +02:00
Laurent Destailleur
a6b05bb4da Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0 2017-04-12 14:08:58 +02:00
Laurent Destailleur
abf87a6946 Merge branch '4.0' into fix_reffourn 2017-04-11 11:00:35 +02:00
Laurent Destailleur
60a54041c2 NEW Enable bulk actions delete on supplier invoices 2017-04-07 14:09:19 +02:00
altatof
919633b2be escape supplier ref 2017-04-07 12:10:01 +02:00
altatof
a6ec22d7fe FIX: dont lose supplier ref if no supplier price in database 2017-04-07 12:06:15 +02:00
florian HENRY
7668702806 fix: missing attribute update 2017-04-07 08:56:10 +02:00
Laurent Destailleur
216bce608d Work on v6 look and feel 2017-04-06 23:28:06 +02:00
Laurent Destailleur
3740137e31 Add tooltip on label of each open item. 2017-03-28 10:44:52 +02:00
BENKE Charlie
3299e5f889 PRODUCT_PRICE_SUPPLIER_NO_LOG test inverted 
if PRODUCT_PRICE_SUPPLIER_NO_LOG is empty, no log is stored
if PRODUCT_PRICE_SUPPLIER_NO_LOG is not empty log is stored
they are inversion
@eldy maybe add more field in this table
 2017-03-26 19:13:10 +02:00
Laurent Destailleur
106d19a8af FIX #6468 + Fix missing translation 2017-03-25 03:53:11 +01:00
Laurent Destailleur
f241bfefd0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 20:20:59 +01:00
Laurent Destailleur
2062047dea Merge pull request #6555 from atm-gauthier/5.0_fix_originid_on_supplierorder 
FIX : origin & origin id on supplier order line
 2017-03-23 20:03:58 +01:00
Laurent Destailleur
3adb43c6e5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/boxes/box_produits.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/langs/en_US/bills.lang
	htdocs/product/class/product.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2017-03-23 12:52:19 +01:00
Laurent Destailleur
7df9c25e60 Several fixes on multicurrency 2017-03-23 12:44:20 +01:00
gauthier
a790ef9f7c FIX : origin & origin id on supplier order line 2017-03-23 12:35:43 +01:00
Laurent Destailleur
b7442a0c1a Fix bad vat rate used into sql request 2017-03-19 15:38:07 +01:00
Laurent Destailleur
75d73b188c Fix bad vat rate used into sql request 2017-03-19 14:51:25 +01:00
Laurent Destailleur
4831fb4dcb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php
 2017-03-19 11:26:49 +01:00
fappels
c1b21db407 Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0_fix_fourn_commande_class 2017-03-16 10:06:20 +01:00
fappels
f9c2bb0410 Fix create supplier order line label 
Fix create line label
Fix read line rang, special_code and fk_parent_line
Remove create line rang, done by table default and $this->rang is
invalid, supplier order has no rang property.
 2017-03-16 10:05:50 +01:00
Laurent Destailleur
c72e7c1057 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
 2017-03-10 14:54:35 +01:00
Laurent Destailleur
427f656bac Merge pull request #6500 from atm-florian/4.0 
FIX : Can use quote into supplier ref on order line add
 2017-03-10 12:49:36 +01:00
Laurent Destailleur
a4b6388ba1 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2017-03-10 12:35:33 +01:00
Laurent Destailleur
6977daf76a Merge pull request #6491 from atm-gauthier/4.0_fix_supplierinvoiceline_fetch 
FIX : forgotten fk_facture_fourn attribute on supplierinvoice line ob…
 2017-03-10 12:31:20 +01:00
florian HENRY
9b10c9f6d1 FIX : Can use quote into supplier ref on order line add 2017-03-10 09:19:42 +01:00
gauthier
9eb3975803 FIX : forgotten fk_facture_fourn attribute on supplierinvoice line object 2017-03-07 15:18:20 +01:00
gauthier
b192b6cd50 FIX : multicurrency_subprice 2017-03-07 11:33:18 +01:00
gauthier
6e0589ce2c FIX : load multicurrency informations on supplier order and bill lines fetch 2017-03-07 10:55:17 +01:00
fappels
e83122be41 Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0 2017-02-27 17:57:07 +01:00
arnaud
4ec664029d Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment 2017-02-17 16:40:14 +01:00
arnaud
977c18513d FIX pdf supplier payment work 2017-02-14 12:00:56 +01:00
Laurent Destailleur
1dca3471db Merge pull request #6409 from IonAgorria/supplierorder-oldline 
FIX: Fill oldline in supplier order updateline
 2017-02-12 20:45:20 +01:00
Laurent Destailleur
d72e5a3646 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-10 17:34:23 +01:00
Ion
2418754d71 Fill oldline in supplier order updateline 2017-02-08 23:27:58 +01:00
Laurent Destailleur
e0850b29cd Merge pull request #6399 from fappels/5.0 
Qual reputation for price supplier
 2017-02-08 16:42:20 +01:00
fappels
a84c6f9b45 Qual reputation for price supplier 
Move available reputation constants from view-controller to class
 2017-02-08 13:35:34 +01:00
Laurent Destailleur
31c3398b7f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/modules.php
 2017-02-08 10:59:05 +01:00
Paris Liakos
eb452397bd Wrong trigger when setting supplier invoice back to draft 2017-02-08 10:56:28 +01:00
Laurent Destailleur
64da0e77d5 Merge pull request #6358 from defrance/patch-71 
FIX : fill fourn remise percent with select product mode
 2017-02-02 02:27:35 +01:00
Laurent Destailleur
13f37b2cb9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-02 02:25:49 +01:00
Laurent Destailleur
f6144b9ecb Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-02 02:24:57 +01:00
BENKE Charlie
d84e50d15c get remisepercent of product if select list 
when we use the select list of product instead of free search we don't fill the remise
 2017-01-31 23:11:16 +01:00
Maxime Kohlhaas
7b6488b1c7 Fix numbering was disaplying technical error instead of error message 2017-01-27 10:05:57 +01:00
Marcos García de La Fuente
e0cbcadd98 In case Model for document generation is not defined, the criteria to select the model is now: 
1. Model for the object
 2. Custom default module
 3. Hardcoded default module
 2017-01-16 21:16:05 +01:00
Laurent Destailleur
febd23fe41 Clean dead code 2017-01-03 11:22:03 +01:00
Laurent Destailleur
b642a3a602 Prepare release 5.0 2016-12-31 16:35:56 +01:00
Laurent Destailleur
9e44eb0d15 Fix return code REST similar for all api with POST 2016-12-23 02:08:22 +01:00
Laurent Destailleur
ecab7cb70e Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/class/product.class.php
 2016-12-14 12:29:41 +01:00
Laurent Destailleur
43d18cd70c FIX if a supplier price reference is changed after creating an order, we 
can't clone order.
 2016-12-13 13:22:24 +01:00
Jean-Pierre Morfin
a4e424ee0e FIX updating supplier order line 2016-12-11 11:59:49 +01:00
Maxime Kohlhaas
a4a47a064c fix missing commit and return 2016-12-11 02:50:31 +01:00
Maxime Kohlhaas
3d2143809b Multicurrency on supplier order and invoice 2016-12-11 02:09:57 +01:00
Laurent Destailleur
49f5ec6b52 Fix bugs reported by scrutinizer 2016-12-07 19:12:25 +01:00
Laurent Destailleur
1838670e31 Fix several security holes on api when used by external users 2016-12-07 19:02:39 +01:00
Laurent Destailleur
5edf215b74 Add missing api file 2016-12-05 13:32:08 +01:00
Laurent Destailleur
761a795294 Maxi debug on REST APIs 2016-12-05 13:31:29 +01:00
Ion Agorria
f7a07f2491 Supplier order statut is not reverted on RECEIVE trigger fail 2016-11-26 22:13:31 +01:00
Laurent Destailleur
f9f1f92d86 FIX #6025 2016-11-22 19:45:06 +01:00
Laurent Destailleur
b4c20f1b1a Fix regression in creation of invoice 
Uniformize code
 2016-11-08 11:23:40 +01:00
Laurent Destailleur
5b2a44f16f Fix phpunit regression 2016-11-03 20:10:01 +01:00
Laurent Destailleur
b4fbbe7391 Merge pull request #5947 from aspangaro/5.0-p34 
Work on supplier credit/deposit/replacement invoice
 2016-11-03 11:27:10 +01:00
aspangaro
de8ed22448 Work on supplier credit/deposit/replacement invoice 2016-11-02 07:13:17 +01:00
Laurent Destailleur
e9edbba093 NEW Usage of vat code seems ok everywhere. 2016-10-29 21:02:08 +02:00
Laurent Destailleur
03b882d095 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2016-10-29 19:12:58 +02:00
Laurent Destailleur
17c1b3f1d2 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-10-29 19:00:43 +02:00
Laurent Destailleur
78eaeab168 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-10-29 18:44:55 +02:00
Maxime Kohlhaas
3dbab863a7 Fix : vars were not set after commande function 2016-10-28 10:24:31 +02:00
Juanjo Menent
94a884cea8 Fix: Use undeclared variable 2016-10-25 09:45:53 +02:00
Juanjo Menent
9ab25d4472 Fix: Use undeclared variable 2016-10-24 18:51:46 +02:00
Laurent Destailleur
39bc78909b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2016-10-24 03:35:43 +02:00
Laurent Destailleur
33a7b7037d Save information of vat code into database 2016-10-24 03:23:40 +02:00
Laurent Destailleur
b5b76dfaf7 Merge pull request #5889 from atm-gauthier/NEW_filter_socid_on_find_min_price_product_fournisseur 
FIX param socid so find_min_price_product_fournisseur() use correct thirdparty when we create supplierorder from supplierproposal
 2016-10-24 01:06:15 +02:00
Laurent Destailleur
e388feee07 Merge pull request #5771 from defrance/patch-28 
Add update_total function (like on other element)
 2016-10-24 00:41:27 +02:00
Laurent Destailleur
9ab8f76777 Fix insert supplier invoice line 2016-10-22 18:40:21 +02:00
gauthier
7d63925118 NEW : param socid find_min_price_product_fournisseur() function 2016-10-18 15:35:48 +02:00
Laurent Destailleur
ee1ee1eee7 Management of the "Copy of" when cloning projects. 2016-10-16 12:12:45 +02:00
aspangaro
a328e673a3 Work on supplier type (Replacement / deposit / credit note) invoice 2016-10-02 21:39:24 +02:00
Laurent Destailleur
fe7e600dd3 Merge pull request #5820 from IonAgorria/fixcloneline 
FIX: cloned supplier order lines not having all parameters
 2016-10-01 18:59:57 +02:00
aspangaro
cf883e0eeb Update fournisseur.facture.class.php 2016-10-01 06:19:22 +02:00
Ion Agorria
0816cc87c3 Fix cloned supplier order lines not having all parameters 2016-09-30 20:09:59 +02:00
Laurent Destailleur
b2307f9b90 Uniformize code 2016-09-28 21:08:25 +02:00
Laurent Destailleur
86d86f8442 NEW #5801 More complete change to allow to disable supplier invoice 
document generation
 2016-09-28 18:59:44 +02:00
aspangaro
922495d72d Correct travis & typo "Execuete" 2016-09-24 07:18:38 +02:00
BENKE Charlie
f826013cb3 Update fournisseur.facture.class.php 2016-09-21 12:07:43 +02:00
BENKE Charlie
c713eb987e Update fournisseur.facture.class.php 2016-09-21 12:06:39 +02:00
BENKE Charlie
cb736f5b93 Add update_total function (like on other element) 
the goal is to have and use the same function in all the native standard element (proposal, order, bill / customer and fournish)
 2016-09-21 12:05:18 +02:00
Laurent Destailleur
4f842fd2cb Uniformize look and feel 2016-09-19 13:57:50 +02:00
Laurent Destailleur
81590e3833 Merge pull request #5757 from IonAgorria/fix-sorder-insert 
FIX: Wrong line insert trigger in supplier order
 2016-09-17 17:47:16 +02:00
Ion Agorria
7fe0c4211c Move order supplier deleteline code to line class 2016-09-17 02:35:02 +02:00
Ion Agorria
54756ef729 Fix wrong trigger in supplier order 2016-09-15 23:45:13 +02:00
Ion Agorria
2bc41a1fd0 Fix ref supplier not recorded in addline 2016-09-13 18:41:13 +02:00
Laurent Destailleur
9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 02:05:38 +02:00
Laurent Destailleur
c71fc18942 NEW Checkbox 'close order to "Everything received" automatically if all 
products are received' is visible on supplier orders.
 2016-09-12 01:05:45 +02:00
Laurent Destailleur
1bb278a587 Fix #5712 2016-09-11 23:01:04 +02:00
Laurent Destailleur
4d9abbd710 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-09-09 18:35:26 +02:00
Juanjo Menent
6e39d83480 Merge remote-tracking branch 'upstream/3.9' into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-09-09 16:51:41 +02:00
Juanjo Menent
d8f50f9acd Merge remote-tracking branch 'upstream/3.9' into 4.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-09-09 16:34:02 +02:00
Juanjo Menent
e3c2299c67 Merge remote-tracking branch 'upstream/3.8' into 3.9 
Conflicts:
	htdocs/admin/dict.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-09-08 18:52:44 +02:00
Philippe
972a2db3a3 No initialisation of the array before filling it. May cause some trouble when fetch is call several times and lines added or deleted 2016-09-08 11:40:39 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
 2016-08-28 02:40:20 +02:00
florian HENRY
ba422615dd better trigger management on supplier order 2016-08-25 14:38:16 +02:00
Laurent Destailleur
e22e243bc5 NEW Can set to paid automaically social or fiscal contributions after a 
payment was recorded.
 2016-08-22 14:31:15 +02:00
fappels
b6f9aa4592 Fix SQL error insert supplier order line 
$this->fk_multicurrency not set gives SQL error
 2016-08-11 21:10:56 +02:00
florian HENRY
0176acd08f fix travis 2016-08-05 16:15:30 +02:00
florian HENRY
1e929e647d better management of dispatch status 2016-08-05 10:02:36 +02:00
florian HENRY
0780188f4e taking account @eldy remarks 2016-08-05 09:46:17 +02:00
florian HENRY
a39290022f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_NEW_ClassOrderDeliverStatusOnStockVentil

Conflicts:
	htdocs/langs/en_US/workflow.lang
 2016-08-05 09:34:27 +02:00
Laurent Destailleur
33d12a4492 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/admin.lang
 2016-08-05 01:15:19 +02:00
Laurent Destailleur
5126786d60 NEW Add option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED 2016-08-04 15:48:34 +02:00
florian HENRY
4001bc474e NEW : Add workflow to calculated supplier order status on stock dispatch 2016-08-04 11:37:32 +02:00
Laurent Destailleur
abbe204c97 Fix design of option PROJECT_ADD_SUBTOTAL_LINES 2016-08-03 01:42:05 +02:00
Laurent Destailleur
801da08c76 FIX syntax error sql due to multicurrency 2016-07-28 14:10:43 +02:00
Laurent Destailleur
3639d30389 FIX Error is not returned 2016-07-28 14:07:59 +02:00
Laurent Destailleur
209bb213c0 Merge pull request #5475 from IonAgorria/ordersup-trigger 
New: Trigger for set status in supplier order
 2016-07-28 09:48:04 +02:00
Ion Agorria
078439cf18 Use different trigger name per status 2016-07-26 19:53:29 +02:00
Sergio Sanchis Climent
c101a6c483 update camel caps to update_total() 2016-07-19 13:56:48 +02:00
Sergio Sanchis Climent
76f17737be change dolsyslog 2016-07-19 13:50:32 +02:00
Sergio Sanchis Climent
07b6c991ff Create CommandeFournisseurLigne->insert 
Create SupplierInvoiceLine->insert
 2016-07-19 12:57:23 +02:00
Laurent Destailleur
73f574b649 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/repair.php
 2016-07-12 19:30:01 +02:00
Ion Agorria
c596f8d9bd New: Trigger for set status in supplier order 2016-07-10 23:05:51 +02:00
Laurent Destailleur
0f23cef46c Fix warning of the repair tool. 2016-07-08 18:59:36 +02:00
Laurent Destailleur
b529a53501 Fix var not initialized 2016-06-28 02:36:40 +02:00
Frédéric FRANCE
7004dfbc15 typo 2016-06-25 09:57:46 +02:00
Laurent Destailleur
293c8e145a Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/imports/import.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 02:20:27 +02:00
Laurent Destailleur
c09dbe05b3 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/class/ldap.class.php
	htdocs/expensereport/card.php
	htdocs/langs/en_US/admin.lang
 2016-06-05 00:25:08 +02:00
Maxime Kohlhaas
3ef9fe2c40 Fix product supplier price modification with multicompany 2016-06-04 18:10:40 +02:00
Maxime Kohlhaas
bd2fe75d08 Fix menus in dashboard links 2016-06-04 14:45:03 +02:00
Laurent Destailleur
ff6daebee6 FIX #5203 2016-06-04 01:19:27 +02:00
Laurent Destailleur
5c36aa3802 Merge pull request #5271 from aschio/develop 
FIX #5192
 2016-06-04 00:17:45 +02:00
cla
18424812db closes #5192. 
I deleted the line and moved last_insert_id() functions 3 lines under
 2016-06-03 23:49:08 +02:00
Laurent Destailleur
149c6916f8 FIX ##5263 2016-06-03 22:20:58 +02:00
Ion Agorria
6ba86e9d03 Fill ref_supplier in product supplier price 2016-05-26 20:53:01 +02:00
Laurent Destailleur
a587ba496c NEW Can select fields on supplier orders 2016-05-24 18:43:35 +02:00
Laurent Destailleur
4e46a01d51 Fix regression introduced with option SUPPLIERORDER_WITH_NOPRICEDEFINED 2016-05-17 22:59:46 +02:00
Laurent Destailleur
06d0c261ad Add TODO comment 2016-05-05 23:19:21 +02:00
Laurent Destailleur
c795803da1 FIX ref_supplier was not set. We also refered to old var names. 2016-05-05 20:19:56 +02:00
Laurent Destailleur
0cde6ad98f Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2016-04-29 20:43:42 +02:00
Laurent Destailleur
3d9456b202 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/facture/list.php
 2016-04-29 20:42:35 +02:00
Laurent Destailleur
8a4871323d Merge pull request #5022 from marcosgdf/bug-5008 
FIX #5008 SQL error when editing the reference of a supplier invoice that already exists
 2016-04-29 17:01:01 +02:00
Laurent Destailleur
3d4ddcb29e Merge pull request #5065 from atm-maxime/fix_supplier_order_log 
Fix log function was removed in 1b6fa8ec34
 2016-04-22 19:45:36 +02:00
Laurent Destailleur
1de36d6501 Merge pull request #5011 from altatof/supplierorder_noprice 
NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED
 2016-04-22 18:27:42 +02:00
Maxime Kohlhaas
bea8b49d8c Fix log function was removed in 1b6fa8ec34 2016-04-22 09:02:40 +02:00
Marcos García de La Fuente
e2c86d3fd8 NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead 2016-04-17 15:24:22 +02:00
Marcos García de La Fuente
aa64266c2f FIX #5008 SQL error when editing the reference of a supplier invoice that already exists 
Close #5008
 2016-04-16 18:44:31 +02:00
Christophe Battarel
c3d4cd85f1 NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED allow supplier 
order even if no supplier price defined
 2016-04-15 12:28:35 +02:00
Laurent Destailleur
8d46d76f96 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:03:19 +02:00
Laurent Destailleur
8342a61ea9 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/fourn/facture/card.php
	htdocs/product/composition/card.php
 2016-04-12 15:00:02 +02:00
Christophe Battarel
791df0c9ea FIX: correct display of minimum buying price 2016-04-11 17:27:34 +02:00
Marcos García de La Fuente
b2f922291f FIX #4851 Project selector in supplier invoices shows the project label twice 
Close #4851
 2016-04-09 22:38:58 +02:00
Laurent Destailleur
f8b39ab50e Fix errors reported by scrutinizer 2016-04-09 19:04:23 +02:00
Laurent Destailleur
1b6fa8ec34 Clean dead code 2016-04-09 19:04:04 +02:00
Laurent Destailleur
27217ccccd Maxi debug of supplier order workflow. 
Add trigger ORDER_SUPPLIER_CLASSIFY_BILLED
Parameter user is added so it is defined into triggers.
 2016-04-09 18:51:09 +02:00
Laurent Destailleur
c2fc9ecf68 Fix scrutinizer warning 2016-04-09 16:12:53 +02:00
Laurent Destailleur
3827a06796 Debug the supplier ref reputation feature. 2016-04-08 22:18:36 +02:00
Laurent Destailleur
448758bbf4 Merge branch 'develop_NEW_supplier_price_reputation' of 
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_supplier_price_reputation

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-04-08 22:01:55 +02:00
Laurent Destailleur
b9ffc18c27 Uniformize log of supplier order. Now use the generic log feature. 2016-04-08 17:28:48 +02:00
Laurent Destailleur
b1c2198154 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/ajax/selectsearchbox.php
	htdocs/core/lib/price.lib.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFacture.class.php
	htdocs/projet/list.php
	htdocs/societe/list.php
 2016-04-07 20:01:52 +02:00
Alexis Algoud
61a077b0ee NEW reputation for price supplier 2016-04-06 09:58:03 +02:00
fmarcet
d3794bb145 FIX: Not removing code into vatrate. 2016-04-05 16:49:50 +02:00
BENKE Charlie
e455a2c9a8 only enabled society is used for product select 2016-03-07 08:25:21 +01:00
Laurent Destailleur
d1777a6783 Replace function rand with mt_rand (prepare php 8) 2016-03-05 15:01:25 +01:00
Marcos García de La Fuente
123d6fb6e5 FIX #4425 Missing "VAT" translation in supplier order popup 
Close #4425
 2016-03-02 11:29:42 +01:00
Laurent Destailleur
8807222f24 Fix a lot of fixes to have the french vat npr working better 2016-02-27 12:22:39 +01:00
Laurent Destailleur
c86a1a30d5 Fix a lot of fixes to have the french vat npr working better 2016-02-27 11:46:16 +01:00
Laurent Destailleur
ff9a82c96f Merge pull request #4670 from atm-ph/new_add_multicurrency_supplier_invoice_payment 
New add multicurrency supplier invoice payment
 2016-02-22 16:26:31 +01:00
Laurent Destailleur
f6d1913bb7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-02-22 13:35:46 +01:00
phf
fd4cda819c New add supplier payment 2016-02-21 22:47:52 +01:00
philippe grand
6f6f2a0574 enhance code help translation 2016-02-20 11:18:02 +01:00
phf
d320aebe82 Fix muticurrency attributs not declared in class PropalLine 
Fix fetch_lines of FactureFournisseur with multicurrency fields
 2016-02-19 22:41:47 +01:00
phf
b7d99271f8 New add multicurrency on supplier order 2016-02-19 22:25:59 +01:00
Laurent Destailleur
9c8d69eaa9 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-19 04:46:11 +01:00
phf
e24a35b904 New add multicurrency on supplier proposal/order 2016-02-16 23:58:21 +01:00
philippe grand
03b9b65d93 [quality] : better help 2016-02-16 16:45:19 +01:00
Laurent Destailleur
e0a0817123 Merge pull request #4623 from IonAgorria/dynamic-price-changes 
Dynamic price corretions/changes
 2016-02-16 15:11:02 +01:00
Laurent Destailleur
71a12824c9 Merge branch 'new_numbering_module_supplier_payment' of 
https://github.com/atm-ph/dolibarr into
atm-ph-new_numbering_module_supplier_payment

Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 00:31:33 +01:00
Ion Agorria
89657d0439 Changed Price Parser functions and added testExpression 2016-02-14 17:28:31 +01:00
Ion Agorria
99efbd3464 Check if dynamic price is enabled 2016-02-14 16:09:47 +01:00
Ion Agorria
1f99ce8ae9 Fix var typo 2016-02-14 01:21:56 +01:00
Ion Agorria
1a45ab9d50 Fix missing vars in fetch_product_fournisseur_price 2016-02-11 20:29:45 +01:00
phf
d66bc6f1b3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_numbering_module_supplier_payment 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2016-02-06 12:57:30 +01:00
phf
a8e480e392 FIX #3509 payment ref for suppliers 2016-02-04 23:15:06 +01:00
Laurent Destailleur
8e882b4cc2 NEW Add warning on tasks when they are late (add also the warning 
tolerance parameter)
 2016-01-18 15:56:51 +01:00
Sof
c04eef35d5 FIX: Field cost_price does not exist and typos 2015-12-28 19:07:25 +01:00
Laurent Destailleur
18fdb75c98 Missing global 2015-12-23 20:02:15 +01:00
Laurent Destailleur
559e621fd2 Fix conflict with trigger to delete payment customer and supplier. 2015-12-23 19:54:56 +01:00
Laurent Destailleur
f0802eb36b FIX #4245 PHP 7 2015-12-19 19:48:36 +01:00
Laurent Destailleur
3517b64031 FIX #4228 PHP7 error 2015-12-19 18:18:24 +01:00
Laurent Destailleur
f25a9030eb Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	.travis.yml
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php
	htdocs/includes/adodbtime/adodb-time.inc.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-18 22:12:03 +01:00
Sof
011f0fbb0b FIX : Typo error 2015-12-15 14:04:52 +01:00
Laurent Destailleur
84ee18a11b Fix bad management of second level approvement 2015-12-14 10:33:18 +01:00
Laurent Léonard
7e31c8f38f Fix decimals in payments of supplier invoices 2015-12-07 01:27:08 +01:00
Laurent Destailleur
055e650adf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-02 23:23:38 +01:00
Laurent Destailleur
de730c9762 NEW Introduce cost price on product. 2015-11-30 21:20:45 +01:00
Laurent Destailleur
c55d11869b Billing of supplier or customer order is a process that can be done in 
parallel with shipment or reception, so we show the status on another
field into lists.
 2015-11-29 15:54:32 +01:00
Laurent Destailleur
b47dbc7a5f Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
	htdocs/projet/element.php
 2015-11-26 01:32:21 +01:00
Marcos García
a30f7d543a Corrected fix 2015-11-25 10:19:11 +01:00
Laurent Destailleur
2a345b6fc0 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/admin/company.php
	htdocs/admin/menus/edit.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
 2015-11-21 12:48:41 +01:00
Marcos García de La Fuente
e8fc5f0d3a FIX #3987 Undefined variable $newref in CommandeFournisseur::approve 2015-11-21 11:00:56 +01:00
Laurent Destailleur
835700bb25 Merge pull request #4006 from marcosgdf/bug-3989 
FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl
 2015-11-16 23:42:38 +01:00
Laurent Destailleur
04ffe1c7f0 Merge pull request #4005 from marcosgdf/bug-3988 
FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline
 2015-11-16 23:42:04 +01:00
Alexis Algoud
55b23c4918 FIX add billed field in supplier order 2015-11-16 14:55:46 +01:00
Marcos García de La Fuente
53fb085766 Corrected indent 2015-11-16 13:29:37 +01:00
Marcos García de La Fuente
ec7e4cb3d4 FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl 2015-11-16 13:25:00 +01:00
Marcos García de La Fuente
0880b13142 FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline 2015-11-16 13:24:11 +01:00
Marcos García de La Fuente
be460b6cbf FIX #3992 CommandeFournisseur::ref is marked as deprecated and it shouldn't be 2015-11-16 13:20:56 +01:00
Laurent Destailleur
6bd6be0912 Debug and rename experimental module "supplier proposal". Still work to 
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
 2015-11-15 19:23:39 +01:00
Laurent Destailleur
388748055a Fix missing translation for VAT 2015-11-15 15:08:54 +01:00
Laurent Destailleur
01058be44c NEW Introduce a "code" into fiels to describe vat. This will allow to 
suggest different vat lines with same value with ability to
differentiate them.
 2015-11-14 17:53:58 +01:00
frederic34
7349862b64 translations 2015-11-07 11:19:31 +01:00
frederic34
a597d6c379 allow chaining 2015-11-07 10:23:56 +01:00
frederic34
becce332dd allow chaining and remove header exit 2015-11-07 09:52:00 +01:00
Laurent Destailleur
e26940ddf7 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/core/lib/admin.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/filelist.xml
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
	htdocs/societe/price.php
 2015-11-05 01:50:30 +01:00
Laurent Destailleur
df4f09e72f FIX #3240 2015-11-03 14:02:36 +01:00
Laurent Destailleur
72915aa16d Merge pull request #3784 from All-3kcis/develop-patch-11 
NEW Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE"
 2015-11-02 11:23:49 +01:00
All-3kcis
a658ff7e90 add commit or rollback if error 2015-11-02 10:26:07 +01:00
Laurent Destailleur
1f1e72f2b6 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/main.inc.php
 2015-10-25 19:54:41 +01:00
All-3kcis
00c2b1a32a move db->begin() before trigger 2015-10-22 14:30:11 +02:00
All-3kcis
ceae04b76e move trigger before query 2015-10-22 12:03:01 +02:00
Frédéric FRANCE
4689b0cc11 Update fournisseur.commande.class.php 2015-10-21 17:31:51 +02:00
All-3kcis
ca8c1adf55 Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE" for frounisseur.product remove_product_fournisseur_price() 2015-10-21 10:07:53 +02:00
All-3kcis
3cb2637f25 Correct return value 2015-10-20 09:42:02 +02:00
Laurent Destailleur
81580f75b9 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture.php
 2015-10-18 21:22:42 +02:00
Laurent Destailleur
3d94e3d80e FIX Editing a supplier price should keep the vat. 2015-10-17 12:01:17 +02:00
Frédéric FRANCE
d68db2a844 Update fournisseur.commande.class.php 2015-10-17 08:48:53 +02:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Laurent Destailleur
1f742c7464 FIX Add a test to save life when ref of object (invoice ref, order ref, 
...) was empty. The was no way to go back to a clean situation, even
after vaidating again the object.
 2015-10-06 16:38:27 +02:00
Juanjo Menent
31230d296d Merge remote-tracking branch 'upstream/3.8' into develop 2015-10-03 23:51:38 +02:00
Juanjo Menent
8febf25c23 Fix: #3566 2015-10-03 23:34:10 +02:00
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited 
[Qual] Cleanup of inherited class properties
 2015-09-26 11:23:59 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
9f2545b95d [Qual] Replaced deprecated dol_clone by native clone 2015-09-24 17:24:40 +02:00
Laurent Destailleur
b94fb9e1f3 Merge remote-tracking branch 'origin/3.8' into develop 2015-09-12 18:22:10 +02:00