Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 11:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
118,804 Commits 36 Branches 190 Tags
86971c7b863c1b891c30f901b5ed3751eeaa720d
Commit Graph

1934 Commits

Author SHA1 Message Date
Gauthier PC portable 024
72614ecc0d Merge branch 'NEW/addline_with_position_choice_develop' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 16:43:01 +01:00
Gauthier PC portable 024
375dcf7028 FIX : dev name 2021-11-16 16:42:48 +01:00
stickler-ci
19171d4f8e Fixing style errors. 2021-11-16 15:15:55 +00:00
Gauthier PC portable 024
f664a977c6 Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 16:05:17 +01:00
Gauthier PC portable 024
c55008e8af NEW : insert_discount() functions handle 2021-11-16 16:02:55 +01:00
Gauthier PC portable 024
9d41c1390d Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 14:20:24 +01:00
Gauthier PC portable 024
1e0d7d92a9 NEW : addline with position choice when MAIN_VIEW_LINE_NUMBER is enabled 2021-11-16 14:09:18 +01:00
Ferran Marcet
7af883abc1 Fix: Bad date conversion 2021-11-15 16:43:54 +01:00
Laurent Destailleur
f2bfa8b2a1 Merge pull request #18940 from PyroShape/develop2 
NEW : info of number of product still to dispatched in a supplier order
 2021-11-15 13:58:43 +01:00
Laurent Destailleur
cb65903537 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/langs/en_US/bills.lang
 2021-11-08 03:09:30 +01:00
Laurent Destailleur
e8b3875e2e FIX bad sign of amount stored for multicurrency columns on credit notes 2021-11-08 02:57:21 +01:00
Laurent Destailleur
dd2207d6c5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/core/db/DoliDB.class.php
	htdocs/resource/list.php
 2021-11-06 21:11:05 +01:00
kamel
82b7f0e9e4 FIX second approval back in stable feature as is the setting for minimum amount (last part from PR#14286) 2021-11-02 15:21:14 +01:00
Benjamin Chantalat
5be40b926b Clean function not use anymore 2021-11-01 19:56:24 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
 2021-10-31 16:19:10 +01:00
Florian HENRY
9d15a7a18c fix: warning on delete wupplier order 2021-10-28 17:37:30 +02:00
Laurent Destailleur
dc1226b116 Fix #yogosha7508 2021-10-25 18:40:19 +02:00
Laurent Destailleur
900d7512f2 Merge pull request #19121 from frederic34/fixrightswarning 
fix multiple warnings
 2021-10-22 22:47:28 +02:00
Frédéric FRANCE
46c4f28478 fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
c81bf68578 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/compta/cashcontrol/cashcontrol_list.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/class/api_products.class.php
 2021-10-22 15:56:44 +02:00
Richard Franks
98eb07d6f2 FIX #18695 Added ref_ext to supplier invoice 
Added ref_ext to the fields for create, fetch and update functions
on fournisseur.facture class. This enables the REST API to use
this field for additional information.
 2021-10-22 10:39:14 +01:00
stickler-ci
4d63586e2a Fixing style errors. 2021-10-22 08:22:23 +00:00
Dennis Priskorn
e2e3e8ef7b Update api_supplier_invoices.class.php 
Add 2 examples
 2021-10-22 10:18:23 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
 2021-10-16 13:01:03 +02:00
Laurent Destailleur
b43dcb24f0 Update fournisseur.commande.class.php 2021-10-11 11:04:21 +02:00
Benjamin Chantalat
a7563ff62e Fix : Found non quoted or not casted var into sql request 2021-10-10 21:15:14 +02:00
stickler-ci
73bd05606c Fixing style errors. 2021-10-10 18:53:22 +00:00
Benjamin Chantalat
65c0167d07 ADD : info of number of product still to dispatched in a supplier order 2021-10-10 20:50:51 +02:00
Benjamin Chantalat
6e60e1f453 Fix date format into supplier order info tab 2021-10-09 20:38:46 +02:00
Laurent Destailleur
6060f0bfb0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/main.lang
 2021-10-04 14:53:44 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
JR-Polyline
2be2423dee Fix dynamic prices not updating 
When Dynamic price module active and an a math expression is used to compute buy price on supplier product card, the calculated price does not update on the card when saved.
Changing line 849 appears to solve this without any ill effect.
 2021-10-01 21:30:25 +08:00
Laurent Destailleur
89ac5a5be6 Merge pull request #18723 from PyroShape/develop 
Explicit date_creation instead of date
 2021-09-28 13:34:44 +02:00
Benjamin Chantalat
5623e5f98a Correct isset 2021-09-26 19:09:09 +02:00
Benjamin Chantalat
5cf90d0247 Correct date format 2021-09-24 14:10:19 +02:00
Benjamin Chantalat
c1e1a53503 Update Explicit date_creation instead of date 2021-09-23 13:23:16 +02:00
Benjamin Chantalat
14f8d7c56b Merge branch 'Dolibarr:develop' into develop 2021-09-22 15:49:43 +02:00
lmarcouiller
7361941420 Close #18770 : Can enter buying price on line 2021-09-22 14:56:44 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Alexandre SPANGARO
ce56f52a30 FIX #18698 Supplier invoice list - "alert" checkbox not working 2021-09-20 03:28:30 +02:00
Benjamin Chantalat
5035ad9be1 Explicit date_creation instead of date 2021-09-15 12:32:18 +02:00
Laurent Destailleur
fa28621709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/list.php
 2021-09-09 16:11:29 +02:00
lmarcouiller
4928d03c4f update to have modify ! to empty() 2021-09-09 14:44:17 +02:00
lmarcouiller
8af6b8679e update with fournisseur && supplier_order 2021-09-09 14:40:39 +02:00
lmarcouiller
022f3e640d Fix #18660 : fix rights of supplier order with API 2021-09-09 13:28:30 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
b04ea59a51 More sql sanitizing 2021-09-02 13:58:42 +02:00
Laurent Destailleur
38c0e93285 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/public/project/index.php
 2021-09-01 17:52:04 +02:00
Vincent Dieltiens
2bad48bdcc FournisseurCommandDispatch extends CommonObjectLine instead of CommonObject 2021-09-01 16:25:29 +02:00
Laurent Destailleur
0aa4868c34 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-31 13:14:01 +02:00