Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
102,145 Commits 35 Branches 179 Tags 1.7 GiB
3de3adad74
Commit Graph

5311 Commits

Author SHA1 Message Date
Laurent Destailleur
271f42e761 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/societe/list.php
 2021-11-19 10:06:35 +01:00
Laurent Destailleur
e7a4f04da4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-11-18 21:41:12 +01:00
Ferran Marcet
7af883abc1 Fix: Bad date conversion 2021-11-15 16:43:54 +01:00
Laurent Destailleur
12f0a36095
Merge pull request #19284 from henrynopo/patch-1 
Supplier Invoice Payment - Re-order the "Payment amount, original currency" to be together with the columns of original currency
 2021-11-15 11:46:00 +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
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
stickler-ci
899f0bee9a Fixing style errors. 2021-11-02 12:59:38 +00:00
Henry
b56eaf91e8
Update paiement.php 2021-11-02 20:53:00 +08:00
Florian HENRY
9d15a7a18c fix: warning on delete wupplier order 2021-10-28 17:37:30 +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
Laurent Destailleur
289f90fb1e Fix qty must not use html type "number" but "text" (need decimal values) 2021-10-20 11:05:40 +02:00
Laurent Destailleur
bd73545d08
Merge pull request #18985 from henrynopo/patch-5 
Fix the rounding issue in case of multi-currency
 2021-10-17 13:50:35 +02:00
stickler-ci
fb79aaeb0c Fixing style errors. 2021-10-15 07:19:49 +00:00
Henry
316bc16634
Update card.php 2021-10-15 15:05:13 +08:00
Henry
3d62ee22d3
Supplier Invoice Payment List 
fix the missing multicurrency payments and remainders
 2021-10-15 11:13:40 +08:00
Laurent Destailleur
9c749a37b1
Merge pull request #18930 from OPEN-DSI/v14-fix-optionals-create-card 
FIX optional visibility on create card
 2021-10-11 11:07:56 +02:00
Laurent Destailleur
b43dcb24f0
Update fournisseur.commande.class.php 2021-10-11 11:04:21 +02:00
Benjamin Chantalat
6e60e1f453 Fix date format into supplier order info tab 2021-10-09 20:38:46 +02:00
lvessiller
be4a00213c FIX optional visibility on create card 2021-10-08 15:58:08 +02:00
Laurent Destailleur
68ac62d09c Fix phpcs 2021-10-07 11:05:06 +02:00
Laurent Destailleur
9b5909300e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/card.php
	htdocs/fourn/facture/card.php
 2021-10-07 11:00:00 +02:00
Laurent Destailleur
e3032ef1c4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/fourn/facture/card.php
 2021-10-06 16:06:25 +02:00
Laurent Destailleur
10f0434116
Update card.php 2021-10-06 15:30:19 +02:00
Laurent Destailleur
3709c6ff47 Fix phpcs 2021-10-06 11:53:27 +02:00
Laurent Destailleur
123c047e29 Fix look and feel v14 2021-10-05 13:34:25 +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
Florian HENRY
6d00097c89 fix 2021-09-30 16:37:52 +02:00
Florian HENRY
d0508d557b fix: checkbox for line selection between supplier order and supplier invoice was infective 2021-09-30 14:56:02 +02:00
Laurent Destailleur
b77cadf39a Fix filter 2021-09-27 11:38:34 +02:00
Laurent Destailleur
51b6318f88 FIX Test when date of invoie is in future (pb with TZ and offset) 2021-09-23 02:14:01 +02:00
lvessiller
991a7ffd43 FIX selected lines on supplier invoice create 2021-09-21 11:04:59 +02:00
Alexandre SPANGARO
ce56f52a30 FIX #18698 Supplier invoice list - "alert" checkbox not working 2021-09-20 03:28:30 +02:00
Laurent Destailleur
3d9be1437a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/list.php
	htdocs/fourn/paiement/list.php
	htdocs/projet/tasks/time.php
 2021-09-17 12:29:58 +02:00
Ferran Marcet
7a637104b2 Fix: Not filter by company when it is an external user 2021-09-15 11:29:12 +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
30856d5b18 FIX Relative discount with high nb of decimals 2021-09-08 22:09:02 +02:00
Laurent Destailleur
2e3b6b2fc8 Backport sql injection fix from develop 2021-09-03 18:00:28 +02:00
Laurent Destailleur
f0a68d728a
Merge pull request #18548 from henrynopo/patch-17 
Fix error of SUPPLIER_INVOICE_ALLOW_REUSE_OF_CREDIT_WHEN_PARTIALLY_REFUNDED
 2021-09-01 18:17:37 +02:00
Vincent Dieltiens
2bad48bdcc FournisseurCommandDispatch extends CommonObjectLine instead of CommonObject 2021-09-01 16:25:29 +02:00
henrynopo
7bf6daaca7
Update card.php 2021-08-30 15:33:26 +08:00
Laurent Destailleur
feb2e71f0c Fix regression 2021-08-28 18:59:12 +02:00
Laurent Destailleur
8ab9c96b7e Fix 0 insert instead of null 2021-08-28 18:56:48 +02:00
Laurent Destailleur
978511e127 Update fournisseur.facture.class.php 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-08-28 17:59:45 +02:00
Laurent Destailleur
1c665c34cd
Merge pull request #18485 from fappels/14_fix_supplier_order_card 
Fix warning on supplier order card when reception enabled.
 2021-08-24 15:31:05 +02:00
henrynopo
73c0471ead Fix error of supplier invoice (variable amount) 
This update fixed the coding error for addline of deposit invoice for variable amount.

In addition, there is no invoice template for supplier invoice, so I also corrected the respective description.
 2021-08-24 15:12:15 +02:00
Laurent Destailleur
67baa48c16 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/fourn/facture/list.php
 2021-08-24 14:56:13 +02:00
Laurent Destailleur
6fa5930e8d Fix label must not be translated 2021-08-24 14:54:46 +02:00
Laurent Destailleur
b10f75932f
Merge pull request #18466 from aspangaro/14p16 
FIX Supplier invoice list - Wrong language key used
 2021-08-24 14:51:46 +02:00