Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 17:01:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
122,559 Commits 36 Branches 190 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

6249 Commits

Author SHA1 Message Date
Laurent Destailleur
2b65ba4a45 FIX insert free price using price without tax on order 2022-02-10 15:03:41 +01:00
Laurent Destailleur
024f12aa9b Fix php5.6 2022-02-10 13:18:21 +01:00
Laurent Destailleur
954938cd75 Fix buttons 2022-02-10 12:33:28 +01:00
Laurent Destailleur
f787512592 Fix buttons 2022-02-10 12:30:29 +01:00
Laurent Destailleur
d69f9eca40 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2022-02-10 11:25:15 +01:00
Laurent Destailleur
a295725368 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-02-10 11:23:45 +01:00
Laurent Destailleur
8db6152a4d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-10 11:23:00 +01:00
Laurent Destailleur
6c8fafddf6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-02-10 11:22:31 +01:00
Laurent Destailleur
7a1c4172a6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-02-10 11:20:09 +01:00
Laurent Destailleur
a40f76c1d8 Merge 2022-02-10 11:15:59 +01:00
Laurent Destailleur
40f0aa45c8 Merge 2022-02-10 11:15:45 +01:00
Laurent Destailleur
793e43c7c6 Update fournisseur.commande.class.php 2022-02-10 09:29:11 +01:00
noec764
d9bac75a63 Merge branch '12.0' into 12.0_Fix_Double_CommandeFournisseurDet 2022-02-09 15:33:45 +01:00
Noé Courtier
e4c1978e12 Change of SQL request when fetching CommandeFournisseurLigne 2022-02-09 12:24:33 +01:00
atm-greg
4c6fd42e3a fix with eldy recommendations 2022-02-09 09:47:48 +01:00
Adrien Raze
ee52cac3ba NEW : Template supplier invoices 2022-02-07 14:34:27 +01:00
atm-greg
6035a374b7 fix bad array index 2022-02-02 14:44:38 +01:00
Laurent Destailleur
44bc197d03 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-01 13:25:45 +01:00
Laurent Destailleur
f9cb209262 Fix max nb of lines in supplier index page 2022-01-31 12:18:04 +01:00
Laurent Destailleur
a631c94193 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-28 15:58:15 +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
0e5907e220 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-24 12:50:35 +01:00
stickler-ci
bc37e75e7f Fixing style errors. 2022-01-23 18:49:28 +00:00
Laurent Destailleur
7a8d0b698a Merge branch 'develop' into packbuyprice 2022-01-23 19:46:26 +01:00
Laurent Destailleur
dee020f286 Update getSupplierPrices.php 2022-01-23 19:40:23 +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
3f33f20fb1 Merge pull request #19840 from dolibit-ut/patch-369 
add CANCEL Button
 2022-01-23 13:06:23 +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
UT from dolibit
56ef9d3d51 add CANCEL Button 
add CANCEL Button
& add more space for small Touchscreens
 2022-01-14 18:44:49 +01:00
Laurent Destailleur
57692ba556 Fix responsive 2022-01-14 17:51:19 +01:00
Laurent Destailleur
35a1b06c44 Fix responsive 2022-01-14 17:48:15 +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