Commit Graph

10473 Commits

Author SHA1 Message Date
Laurent Destailleur
044b4eee48 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/expedition/list.php
2021-01-31 11:54:45 +01:00
Laurent Destailleur
244ee05a9c FIX #14290 #15900 2021-01-30 18:09:13 +01:00
Laurent Destailleur
58dec39f94 Fix start and end month for turnover report. 2021-01-30 17:07:13 +01:00
Laurent Destailleur
f462e353e9 FIX #16079 2021-01-28 09:59:13 +01:00
Laurent Destailleur
0b393676e6 Fix group by 2021-01-28 09:30:01 +01:00
Laurent Destailleur
7365974594 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/langs/en_US/banks.lang
	htdocs/stripe/class/stripe.class.php
2021-01-24 15:24:56 +01:00
Laurent Destailleur
9b6b1e055c Fix trans 2021-01-23 12:20:18 +01:00
Laurent Destailleur
86e853f27d Look and feel v12 2021-01-23 12:18:07 +01:00
Laurent Destailleur
2acf2353a3 Fix bad link 2021-01-23 12:16:25 +01:00
Laurent Destailleur
03d8c6bfd6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/paiement_charge.php
2021-01-19 10:59:42 +01:00
Florian HENRY
a8cdecf1b8 better fix 2021-01-18 19:17:23 +01:00
Laurent Destailleur
314cc45c81 Fix message 2021-01-17 11:24:24 +01:00
Laurent Destailleur
62a5c8b6da FIX Bad balance of begin commit 2021-01-15 15:34:24 +01:00
Laurent Destailleur
cac7fdd058 Look and feel v13 2021-01-15 14:02:18 +01:00
Laurent Destailleur
3e85aec9a5 Fix url 2021-01-15 13:24:37 +01:00
Laurent Destailleur
0d704b0714 FIX error managent and db transaction balance 2021-01-14 19:09:57 +01:00
Florian HENRY
0fa7134bd1 better fix 2021-01-14 13:04:02 +01:00
Laurent Destailleur
8d65dff93d Fix missing param 2021-01-13 11:16:48 +01:00
Florian HENRY
7e30812529 fix review 2021-01-12 22:01:53 +01:00
Florian HENRY
33d7998a96 fix: date auto fill date paiement tax 2021-01-11 19:47:20 +01:00
Florian HENRY
e5ef455628 fix: date auto fill date paiement tax 2021-01-11 19:46:08 +01:00
Laurent Destailleur
d2c0dd35b0 Merge pull request #15937 from aspangaro/13b5
Various payment - Add Amount & direction in clone mode
2021-01-11 15:58:42 +01:00
Laurent Destailleur
d2c86578fa Update card.php 2021-01-11 15:58:20 +01:00
Laurent Destailleur
d859072202 Fix GETPOST 2021-01-11 15:19:47 +01:00
Laurent Destailleur
25a703526e Fix GETPOST 2021-01-11 15:16:01 +01:00
Laurent Destailleur
8debb58f7c Fix rounding of currency unit prices 2021-01-11 13:36:53 +01:00
Laurent Destailleur
16253a79ee FIX GETPOST of qty with wrong parameters
Conflicts:
	htdocs/bom/bom_card.php
2021-01-11 13:11:40 +01:00
Alexandre SPANGARO
004ee952d9 Various payment - Add Amount & Sens in clone mode 2021-01-10 08:16:19 +01:00
Alexandre SPANGARO
1f87bbbd01 Typo 2021-01-07 06:26:24 +01:00
Adrien Raze
6f05ba4db9 NEW : Added of doActions hooks in bank/line.php and bank/transfer.php 2021-01-06 14:26:40 +01:00
Laurent Destailleur
7141fa315e Debug v13 2021-01-04 15:32:18 +01:00
Laurent Destailleur
8df5928e9c Fix selection must depends on enabled modules 2021-01-04 13:32:43 +01:00
Laurent Destailleur
7b3ed7301d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2021-01-02 17:01:03 +01:00
Laurent Destailleur
fd4dab495f FIX Bad cleaning of VAT rate when numbers are into code 2021-01-02 16:51:34 +01:00
Laurent Destailleur
ce0abd17fe Debug v13 2021-01-02 16:18:16 +01:00
Aisuko
2d22c1d5d1 Fix wrong cast for pos_change
The variable pos_change was cast in "int" where it should be cast in "float". It results in rounded value making the receipt showing wrong cash exchange.
2021-01-02 15:59:43 +01:00
Laurent Destailleur
60d1b08f84 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/takepos/invoice.php
2020-12-30 22:58:40 +01:00
Laurent Destailleur
65edc377c3 FIX Visible date of payment 2020-12-30 22:53:21 +01:00
Laurent Destailleur
5a097b21e4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/compta/bank/various_payment/card.php
2020-12-30 13:21:33 +01:00
Alexandre SPANGARO
a336e45098 FIX: #15751 Miscellaneous payment type change to 0 after updating subledger 2020-12-30 08:11:20 +01:00
Alexandre SPANGARO
0e2b7d8b3c Remove typo 2020-12-30 07:23:26 +01:00
Laurent Destailleur
88e441412c CSS 2020-12-24 01:35:59 +01:00
Laurent Destailleur
b66ec5bc64 Fix css 2020-12-23 23:16:27 +01:00
Laurent Destailleur
4471d7d1da FIX debug report expense/income 2020-12-23 22:18:38 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
Laurent Destailleur
bac2ae0d5f Fix warnings 2020-12-22 17:33:17 +01:00
Laurent Destailleur
58b4de8bc3 More complete fix for #15712 2020-12-21 19:27:42 +01:00
Laurent Destailleur
8d901d03fd Fix link 2020-12-21 16:01:47 +01:00
Laurent Destailleur
4ed14d4903 Fix title not saved 2020-12-19 18:52:05 +01:00
Laurent Destailleur
832db82fce Fix warnings 2020-12-18 14:40:45 +01:00