lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
105,843 Commits 43 Branches 150 Tags 886 MiB
87f05067ca
Commit Graph

5545 Commits

Author SHA1 Message Date
Laurent Destailleur
ef70777cf1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/reception/card.php
 2022-01-28 15:57:09 +01:00
Laurent Destailleur
4b5792899e FIX Presentation of qty already order duplicated on reception card 2022-01-28 15:51:18 +01:00
Laurent Destailleur
daca510fa6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	build/docker/docker-compose.yml
 2022-01-23 18:52:47 +01:00
Laurent Destailleur
acafc69baa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-23 16:13:20 +01:00
Laurent Destailleur
251609eb26 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-01-23 16:12:27 +01:00
Laurent Destailleur
0ee0bfed85 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/fourn/commande/card.php
	test/phpunit/testvirus.txt
 2022-01-23 13:04:37 +01:00
Cserveny, Tamás
ca588852df fix code review errors 2022-01-23 12:00:33 +01:00
stickler-ci
bd6fdbd3be Fixing style errors. 2022-01-23 12:00:24 +01:00
Cserveny, Tamás
93edbf1cda missing supplierorder api 2022-01-23 12:00:16 +01:00
stickler-ci
400d28238c Fixing style errors. 2022-01-20 00:09:52 +00:00
Cserveny, Tamás
115f022ae9 Check if the lines in create is type object (like supplier invoice) 2022-01-20 00:55:52 +01:00
Laurent Destailleur
22a3b5ea78 FIX deletion of supplier order when draft 2022-01-18 16:24:28 +01:00
Francis Appels
d4adeba1fc FIX: origin missing for supplier order dispatchProduct 2022-01-18 16:22:41 +01:00
Laurent Destailleur
200f796232 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-18 16:08:54 +01:00
Laurent Destailleur
75eb256589 Fix perm to delete a draft supplier order 2022-01-18 16:06:27 +01:00
Laurent Destailleur
6acf59fe20 Fix responsive 2022-01-14 20:26:56 +01:00
Laurent Destailleur
22ef83ab67 Fix responsive 2022-01-14 20:05:43 +01:00
Laurent Destailleur
8c165aced2 Fix responsive 2022-01-14 20:05:39 +01:00
lvessiller
a9c76f2e44 FIX replace print error with event message when error on update line in supplier order 2022-01-14 16:09:30 +01:00
Laurent Destailleur
91b2d59458 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-14 10:37:41 +01:00
Laurent Destailleur
53e65095a7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/commande/card.php
	htdocs/expedition/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
 2022-01-14 10:36:46 +01:00
Laurent Destailleur
9dde80dd52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expedition/card.php
	htdocs/fourn/commande/list.php
 2022-01-14 10:30:39 +01:00
lvessiller
cacff0c2d4 FIX cast int for search user 2022-01-13 16:18:57 +01:00
lvessiller
22f6d204a2 FIX search by user in supplier order list 2022-01-13 16:01:23 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
cde290c78a
Merge pull request #19402 from atm-gauthier/fix_reorder_lines_after_delete_line_everywhere 
FIX : reorder all lines when delete document line everywhere (4 documents were missing)
 2022-01-10 21:23:23 +01:00
Laurent Destailleur
12044fa67a Debug v15 2022-01-10 03:24:01 +01:00
Laurent Destailleur
05529817f4 css 2022-01-10 00:54:51 +01:00
Laurent Destailleur
423a4ea104 Debug v15 2022-01-09 19:48:38 +01:00
Laurent Destailleur
fcfb6a55f4 Fix error management 2022-01-09 13:50:10 +01:00
Laurent Destailleur
144a8af438 Debug v15 2022-01-07 14:28:58 +01:00
Laurent Destailleur
aa64b9c524
Merge pull request #19756 from oscim/patch-44 
Update paiementfourn.class.php
 2022-01-07 10:46:19 +01:00
Laurent Destailleur
6cecc3c2aa Fix clean data after update 2022-01-07 10:25:58 +01:00
oscim
f157a22cd0
Update paiementfourn.class.php 
For stock in fetch object payment id type
 2022-01-06 16:55:24 +01:00
Laurent Destailleur
18978ac84e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-01-06 16:08:49 +01:00
Laurent Destailleur
f848953238
Merge pull request #19732 from defrance/patch-173 
FIX : allow create supplier order from other external modules
 2022-01-06 15:58:31 +01:00
Laurent Destailleur
a887e41600 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/bankentries_list.php
	htdocs/compta/bank/info.php
	htdocs/compta/bank/line.php
	htdocs/compta/bank/releve.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/fourn/class/fournisseur.product.class.php
 2022-01-04 09:45:31 +01:00
BENKE Charlene
883d6bd63a
Update card.php 2022-01-04 09:32:27 +01:00
BENKE Charlene
0bc33ef3b3
Create card.php 2022-01-04 09:26:10 +01:00
stickler-ci
4e1d4ea1ca Fixing style errors. 2022-01-04 08:23:49 +00:00
BENKE Charlene
e73573d7c4
fix : allow create from other external modules 2022-01-04 09:18:28 +01:00
Laurent Destailleur
cecb11bb1c Debug v15 2022-01-03 12:28:42 +01:00
Laurent Destailleur
a919ade1c6 Fixunit price 2021-12-30 20:00:04 +01:00
Laurent Destailleur
3967ce9c20 Fix unit price 2021-12-30 19:48:59 +01:00
Laurent Destailleur
8085c32b85
Merge pull request #19681 from atm-florianm/FIX_14.0_best_supplier_price_discount_applied_twice 
FIX: discounts are applied twice for displaying best supplier price
 2021-12-30 19:47:07 +01:00
Laurent Destailleur
64777acfc1 Fix unit price 2021-12-30 19:46:58 +01:00
Laurent Destailleur
809c8f993b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2021-12-30 19:03:46 +01:00
Maxime Kohlhaas
1bb07dbc6b Fix #19404 : only validated invoice must be considered in unpaid indicator 2021-12-28 11:02:45 +01:00
Je2fb
369d125002
Update card.php 
Fix bug when you create a supplier order from a project to keep the project when you select the supplier (Option RELOAD_PAGE_ON_SUPPLIER_CHANGE)
 2021-12-23 22:47:30 +01:00
atm-florian
67910db532 FIX: discounts are applied both when fetching the best supplier price and when displaying it 
cf. PR #18873
commit 2be2423dee
 2021-12-23 19:00:39 +01:00