lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
101,904 Commits 43 Branches 150 Tags 886 MiB
07ab352877
Commit Graph

101904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
07ab352877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2021-08-24 16:37:18 +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
Laurent Destailleur
8aa262f302
Merge pull request #18453 from aspangaro/14p15 
FIX #18353 Invoice list translation issue
 2021-08-24 15:29:32 +02:00
Laurent Destailleur
e0fd8b5eb8 Simplify code 2021-08-24 15:28:59 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function 
improve forms - buttonsSaveCreate()
 2021-08-24 15:26:03 +02:00
Laurent Destailleur
a9b0c4ebc5
Merge pull request #18455 from aspangaro/14p10 
FIX #18375 SQL Error on tasks statistics
 2021-08-24 15:16:06 +02:00
Laurent Destailleur
2d870d0f81
Merge branch '14.0' into 14p10 2021-08-24 15:15:38 +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
c3fe1bfdc0
Merge pull request #18459 from henrynopo/patch-9 
Fix error of supplier invoice (variable amount)
 2021-08-24 15:09:53 +02:00
Laurent Destailleur
15da97f1da Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/compta/facture/card.php
	htdocs/product/price.php
 2021-08-24 15:05:14 +02:00
Laurent Destailleur
591059847e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/price.php
 2021-08-24 15:00:35 +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
Laurent Destailleur
169282c82b
Merge pull request #18458 from andreubisquerra/develop 
NEW Split Sale in TakePOS
 2021-08-24 14:51:08 +02:00
Laurent Destailleur
1a56fdad22 Fix type 2021-08-24 14:48:53 +02:00
Laurent Destailleur
b6d74be5cd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-24 14:48:08 +02:00
Laurent Destailleur
465c9bf287 NEW Introduce method hasRight 2021-08-24 14:47:50 +02:00
Laurent Destailleur
8b2c82dd23 Fix position of fields 2021-08-24 14:27:18 +02:00
Alexandre SPANGARO
efb78d7431 FIX Invoice list - Wrong name for column total_tva 2021-08-24 14:22:36 +02:00
Alexandre SPANGARO
7b829bc899 FIX Field already present in SQL request 2021-08-24 14:22:21 +02:00
Laurent Destailleur
4a32788bff
Merge pull request #18463 from aspangaro/14p14 
FIX Invoice list - Wrong name for column total_tva
 2021-08-24 14:20:57 +02:00
Laurent Destailleur
b28180d759
Merge pull request #18471 from aspangaro/12p19 
FIX Accountancy - Some problems of length with general & subledger ac…
 2021-08-24 14:19:16 +02:00
Laurent Destailleur
f93e899c0f
Merge pull request #18472 from FHenry/dev_php8 
fix: php 8 warning
 2021-08-24 14:18:29 +02:00
Laurent Destailleur
9816dff00a
Merge pull request #18480 from henrynopo/patch-11 
Fix - Supplier deposit invoice - auto convert to discount (error)
 2021-08-24 14:09:39 +02:00
Laurent Destailleur
c6774505d8 FIX #18465 2021-08-24 14:05:02 +02:00
Laurent Destailleur
1cfe165613 Better name for field 2021-08-24 13:34:10 +02:00
Laurent Destailleur
366fa13fc0 NEW Add property "copytoclipboard" in modulebuilder 2021-08-24 13:19:53 +02:00
henrynopo
3c1bdd163f
Update paiementfourn.class.php 2021-08-24 18:34:34 +08:00
Francis Appels
edeaa6009f Fix warning on supplier order card when reception enabled. 2021-08-24 10:48:26 +02:00
Laurent Destailleur
56c314c671 Fix translation 2021-08-24 00:32:20 +02:00
Laurent Destailleur
a6ddc90d5b Fix responsive 2021-08-23 23:53:58 +02:00
Laurent Destailleur
3419e43a2c Fix phpunit 2021-08-23 21:02:07 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
bfbde54a90 Fix phpcs 2021-08-23 19:38:59 +02:00
Laurent Destailleur
7af023665f Clean var not defined 2021-08-23 19:37:11 +02:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
Laurent Destailleur
23829ae637 Cast numeric into on sql request 2021-08-23 18:56:46 +02:00
Florian HENRY
4dc542acad fix: php 8 warning 2021-08-23 18:29:04 +02:00
Laurent Destailleur
6d5329bbf8 Fix phpunit 2021-08-23 17:45:16 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
4460206709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-23 16:04:16 +02:00
Laurent Destailleur
edb239837c FIX #yogosha6944 Protection against traversal path. 2021-08-23 16:03:34 +02:00
Laurent Destailleur
cd141373fb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-08-23 16:00:10 +02:00
Laurent Destailleur
d46dfd017a FIX #yogosha6944 Protection against traversal path. 2021-08-23 16:00:03 +02:00
Laurent Destailleur
fc6a0dfcaa FIX #yogosha6944 Protection against traversal path. 2021-08-23 15:47:18 +02:00
Laurent Destailleur
21852bd16b Show link to invoices on member record 2021-08-23 15:25:41 +02:00
Alexandre SPANGARO
a0378549b8 FIX Accountancy - Some problems of length with general & subledger account 2021-08-23 15:19:27 +02:00
Laurent Destailleur
5f16de8150 Code comment 2021-08-23 15:08:29 +02:00
Laurent Destailleur
a25346e302 FIX Date of payment of subscription must not be set to 1970-01-01. 
Fix look and feel v14
 2021-08-23 15:00:29 +02:00