Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 09:21:30 +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
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
Gauthier PC portable 024
1910423684 FIX : conf name is MAIN_ADD_LINE_AT_POSITION 2022-01-11 09:54:27 +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
Laurent Destailleur
0387b9922e FIX error message on sqlfilter in API 2021-12-20 20:49:32 +01:00
Laurent Destailleur
f09e603bf4 Try for FIX #19562 2021-12-19 20:43:24 +01:00
Laurent Destailleur
fbce09f21b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/compta/facture/card.php
	htdocs/reception/card.php
 2021-12-19 00:36:22 +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
Laurent Destailleur
39b4586957 Merge pull request #19624 from 1ocate/FIX_05_author_searching_include_first_and_last_name 
Fix author searching include first and last name
 2021-12-16 17:09:44 +01:00
Laurent Destailleur
9465edd8ec Add warning making payment if pending direct debit or credit trans 2021-12-16 14:09:56 +01:00
Laurent Destailleur
84400cf1d3 Fix backto page 2021-12-16 13:35:17 +01:00
Laurent Destailleur
43e682b56f Fix several pb with down payments 2021-12-16 12:33:45 +01:00
Jay Yeo
41e4e70c6e Fix author searching include first and last name 2021-12-16 16:28:45 +07:00
Jay Yeo
7c1879a11a Fix author searching include first and last name 2021-12-15 16:52:57 +07:00
Laurent Destailleur
6d94c6150b FIX sign of unit price into the supplier credit note 2021-12-13 17:56:28 +01:00
Laurent Destailleur
bb1d5daa82 css 2021-12-12 23:47:40 +01:00
lmarcouiller
0fc9be27bc Fix #19545 : supplier order modification 2021-12-10 11:26:19 +01:00
Laurent Destailleur
d80f83caf4 Clean code 2021-12-09 17:19:31 +01:00
Laurent Destailleur
f4d7cbe045 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-12-09 09:54:09 +01:00
Laurent Destailleur
7ce6009958 Removed deprecated option 2021-12-09 09:53:32 +01:00
Laurent Destailleur
160c8402ea Merge pull request #19524 from 1ocate/typoReceive 
Fix typo 'usercanreceived' -> 'usercanreceive' in '/htdocs/fourn/commande/card.php'
 2021-12-08 21:39:55 +01:00
Laurent Destailleur
5007282d7a Fix missing info popup on product 2021-12-08 15:16:06 +01:00
lmarcouiller
093191aeeb FIx php8.0 warnings 2021-12-03 10:37:48 +01:00