Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
108,088 Commits 36 Branches 189 Tags
cb15a21e41f9af36d14247fbb3f5da8ff4c05588
Commit Graph

1925 Commits

Author SHA1 Message Date
Gauthier PC portable 024
83e8e07416 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-04-08 09:25:08 +02:00
Laurent Destailleur
4693ef42bd Enhance responsive 2022-04-07 11:18:56 +02:00
Laurent Destailleur
f17db2a919 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-05 15:33:29 +02:00
Laurent Destailleur
40ad12c3c3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-04-05 15:29:54 +02:00
Gauthier PC portable 024
b199234afe FIX : each time we create a supplier order, we need to give it a ref_supplier 2022-04-05 12:01:09 +02:00
Laurent Destailleur
a51c868a8e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2022-04-01 14:40:50 +02:00
Laurent Destailleur
d0ee40e55d # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-04-01 14:39:10 +02:00
Gauthier PC portable 024
684e816ac3 FIX : incrementation 2022-03-30 14:12:16 +02:00
Gauthier PC portable 024
6480877b99 FIX : We need to have a different default_ref_supplier for each new fourn invoice 2022-03-30 10:01:17 +02:00
Gauthier PC portable 024
b7e7c95d2a FIX : ref_client doesn't exists on supplier invoice, then ref_fourn needs to have a default value when we want to bill several supplier orders 2022-03-29 16:02:39 +02:00
Laurent Destailleur
bc938d86ba NEW Can enter price with tax for predefined products on purchase objects 2022-03-26 11:22:54 +01:00
Laurent Destailleur
08bc2a7ac0 Better modulebuilder design pattern 2022-03-24 19:27:42 +01:00
Laurent Destailleur
4a80f35aaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-03-23 17:26:25 +01:00
Ferran Marcet
ccf8b01020 Fix: The origin of the stock movement is not being recorded 2022-03-22 13:46:55 +01:00
Laurent Destailleur
98cc40ac8d Fix a useless group by 2022-03-17 13:57:50 +01:00
Laurent Destailleur
7aeaaab7f0 Merge pull request #20365 from gdsoftdev/fix_invoicelineorders 
Fix : keep row order into invoices created from massactions
 2022-03-17 13:37:17 +01:00
Laurent Destailleur
079fcacf13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/products.lang
 2022-03-17 00:16:14 +01:00
Sylvain Legrand
e97932301b DLC and DLUO are reversed in the called function 2022-03-16 22:15:49 +01:00
Jé GDSOFT
6080e1f988 fix : keep lines order when creating invoices from receptions 2022-03-15 14:59:26 +01:00
Gauthier PC portable 024
5b715978e4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-03-10 10:02:57 +01:00
John Livingston
1ece554c92 Fix: typo in template name 
There was a typo in generated HTML comment.
 2022-03-01 17:39:38 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
b0f538387e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
 2022-02-18 21:50:08 +01:00
Henry
c32cc660a3 Update list.php 2022-02-18 08:16:56 +08:00
Laurent Destailleur
2b65ba4a45 FIX insert free price using price without tax on order 2022-02-10 15:03:41 +01:00
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
Gauthier PC portable 024
3abe391f65 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-28 15:08:02 +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
Laurent Destailleur
22a3b5ea78 FIX deletion of supplier order when draft 2022-01-18 16:24:28 +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
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
Gauthier PC portable 024
6799d48944 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-11 09:59:25 +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
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
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
Laurent Destailleur
c08cc96c71 Merge pull request #19592 from Hystepik/develop#2 
Fix #19545 : supplier order modification
 2021-12-16 17:47:34 +01:00