Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-14 21:41:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
148,416 Commits 36 Branches 190 Tags
d87d6d10a4830c124eac24ee56704fcdbdeb901b
Commit Graph

2588 Commits

Author SHA1 Message Date
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