Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 03:51:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
96,016 Commits 36 Branches 190 Tags
0127a3bedb51f05f32f11c23fe9a2398ad1c7e21
Commit Graph

1539 Commits

Author SHA1 Message Date
Egils Consulting
3a9021f191 Update api_supplier_invoices.class.php 
Fix order->invoice and clarify 403 error which is always caused by the invoice already being validated.
 2020-08-04 21:47:39 +02:00
Laurent Destailleur
9d4e672475 FIX Debug direct debit module and credit transfer module 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
 2020-08-04 21:12:03 +02:00
Laurent Destailleur
5189e8beea FIX Debug direct debit module and credit transfer module 2020-08-04 20:26:57 +02:00
Tim Otte
0e03578e91 Fixed translation of product units in documents 2020-08-04 11:51:40 +02:00
Laurent Destailleur
e455f8afa6 Merge pull request #14369 from Tim-Otte/fix-product-unit-translation 
Fixed translation of product units in documents
 2020-08-04 11:50:50 +02:00
Tim Otte
360afccecc Fixed translation of product units in documents 2020-08-04 11:02:16 +02:00
Laurent Destailleur
da76775fbd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/factures.php
	htdocs/compta/prelevement/fiche-rejet.php
 2020-08-03 21:18:45 +02:00
Laurent Destailleur
f62717a16a FIX Debug module direct debit order. Solve conflict with credit transfer 2020-08-03 20:16:33 +02:00
Laurent Destailleur
2687666579 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-29 13:54:12 +02:00
Laurent Destailleur
8045cff888 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
 2020-07-29 13:53:09 +02:00
Laurent Destailleur
d9191c74d8 Update fournisseur.commande.class.php 2020-07-29 12:59:59 +02:00
atm-lena
b480fb2dfc Delete double line 2020-07-28 15:32:58 +02:00
atm-lena
9f0c3b0db1 fetch() command fourn : Same management as commande.class.php of entity 2020-07-28 15:13:56 +02:00
Laurent Destailleur
364fb05ed3 Fix phpcs 2020-07-28 09:46:31 +02:00
Laurent Destailleur
91a50038ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/fiche-stat.php
 2020-07-27 19:35:34 +02:00
Laurent Destailleur
573feed66f FIX locataxes lost on lines when cloning a vendor invoice 2020-07-25 02:59:49 +02:00
Laurent Destailleur
e3126ec999 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/multicurrency/class/multicurrency.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-07-25 00:22:47 +02:00
Laurent Destailleur
a6e728a4d8 Merge pull request #14246 from fappels/11_fix_date_fourn_price_log 
FIX: date in supplier price log tooltip.
 2020-07-24 13:18:36 +02:00
John Botella
fc1de5b4f3 Fix multicurecy option not applied 2020-07-23 11:10:18 +02:00
Francis Appels
c2030a7db5 jdate already in function listProductFournisseurPriceLog 
So no conversion needed.
 2020-07-19 09:43:15 +02:00
Francis Appels
1bc1fd4cb4 Fix date in supplier price log tooltip. 2020-07-15 11:24:11 +02:00
Laurent Destailleur
5ea47f3ade Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/product/admin/product.php
	htdocs/projet/tasks/list.php
 2020-07-08 18:11:58 +02:00
Laurent Destailleur
091fbb2824 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-06 11:55:06 +02:00
Laurent Destailleur
1e9ae1bc02 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-07-06 11:32:04 +02:00
Laurent Destailleur
960512acd9 Update fournisseur.commande.class.php 
Action with filter on rowid does not need to have test on entity
 2020-06-28 21:21:35 +02:00
Laurent Destailleur
dfb7c3e194 Update fournisseur.commande.class.php 2020-06-28 21:14:49 +02:00
florian HENRY
77868ad2a3 fix entity on supplier order 2020-06-24 12:42:41 +02:00
florian HENRY
a7f022dcea Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0 2020-06-24 12:24:55 +02:00
florian HENRY
8c1af0fdb8 fix enbtoty on supplier order 2020-06-24 12:24:47 +02:00
Laurent Destailleur
c36c8ed447 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
 2020-06-17 15:28:19 +02:00
Laurent Destailleur
1a7f0741b5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/fourn/class/paiementfourn.class.php
 2020-06-17 14:53:24 +02:00
Laurent Destailleur
7d3c176727 Prepare convertion of field "montant" into "amount" 2020-06-17 12:45:56 +02:00
Florian Mortgat
3d69a1dc70 FIX 11.0 - multicurrency amount not fetched when fetching payments from llx_paiement or llx_paiementfourn 2020-06-17 11:06:31 +02:00
kamel
5bae9db0a8 FIX: Fix detect distached product and set to received completely when the supplier order have services (support STOCK_SUPPORTS_SERVICES) 2020-06-02 17:29:55 +02:00
Frédéric FRANCE
e5402988d9 Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
Laurent Destailleur
6056ed2755 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
 2020-05-24 01:02:08 +02:00
Laurent Destailleur
7bfbf3c88b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
 2020-05-23 20:20:53 +02:00
Laurent Destailleur
45ddde6940 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
 2020-05-23 20:18:10 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
f5688b2eec add new rule 2020-05-21 01:52:25 +02:00
altairis
55def0248c fix missing rollbacks 2020-05-20 14:37:35 +02:00
Laurent Destailleur
c5e341883d Fix popup of supplier invoice 2020-05-19 23:22:40 +02:00
Scrutinizer Auto-Fixer
8f0e00b4aa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-05-02 01:39:56 +00:00
Laurent Destailleur
1c70e49695 Merge branch 'develop' into 12.0_a23 2020-04-27 14:14:13 +02:00
Scrutinizer Auto-Fixer
1bf5745286 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-25 11:52:07 +00:00
Laurent Destailleur
6b114a31ce Look and feel v12 2020-04-25 03:00:41 +02:00
Laurent Destailleur
291664d109 Look and feel v12 2020-04-25 01:04:26 +02:00
Laurent Destailleur
3ed11f374a Look and feel v12 2020-04-24 23:56:57 +02:00
Laurent Destailleur
d416edab1a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-24 22:50:09 +02:00
Laurent Destailleur
54d641020f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/accounting-files.php
 2020-04-24 22:49:59 +02:00