Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-31 14:12:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
93,080 Commits 37 Branches 191 Tags
982f8eb95d2be6300cbcdc2400a8bdf016a76335
Commit Graph

93080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
982f8eb95d Fix syntax error 2021-01-02 17:03:26 +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
f71c581140 Merge pull request #15856 from aspangaro/13b5 
FIX: Accountancy - Debug experimental function to validate movements & typo
 2021-01-02 15:53:28 +01:00
Laurent Destailleur
02ae06f24a Fix warning 2021-01-02 15:52:12 +01:00
Laurent Destailleur
f16be78167 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/limits.php
	htdocs/takepos/invoice.php
 2021-01-02 15:49:30 +01:00
Laurent Destailleur
d46eb08083 More log and use id to refresh/reload an invoice. 2021-01-02 15:36:19 +01:00
Laurent Destailleur
601d4618d4 Missing vat rates 2021-01-02 14:52:37 +01:00
Laurent Destailleur
a8d15fafd2 Fix missing span 2021-01-02 14:17:54 +01:00
Alexandre SPANGARO
2727fd70b7 FIX: Accountancy - Debug experimental function to validate movements 2021-01-02 14:00:24 +01:00
Laurent Destailleur
791a509c6c Fix warning 2021-01-02 13:26:50 +01:00
Laurent Destailleur
eb3b0ad672 Fix warning 2021-01-02 13:24:06 +01:00
Laurent Destailleur
3cb71ef53e Code comment 2021-01-01 22:55:22 +01:00
Laurent Destailleur
f328bdc3f9 Fix var name 2021-01-01 22:05:12 +01:00
Laurent Destailleur
37e9d13982 Fix warning 2021-01-01 21:25:37 +01:00
Laurent Destailleur
ede38dec30 Fix warning 2021-01-01 21:07:25 +01:00
Alexandre SPANGARO
bf8b1cec3b Merge branch '13.0' into 13b5 2021-01-01 06:17:33 +01:00
Laurent Destailleur
d2345ea96c Fix warning 2020-12-31 16:55:29 +01:00
Laurent Destailleur
d834f6023d Fix rounding 2020-12-31 16:06:54 +01:00
Laurent Destailleur
3743790160 Fix warning 2020-12-31 15:49:25 +01:00
Laurent Destailleur
c5b419ecb5 Removed useless file 2020-12-31 15:45:59 +01:00
Laurent Destailleur
9e8c6eb0a1 FIX #15849 2020-12-31 15:05:17 +01:00
Alexandre SPANGARO
46160614b8 Typo 2020-12-31 03:30:18 +01:00
Laurent Destailleur
e17d4b8220 Fix total when no data 2020-12-30 23:51:55 +01:00
Laurent Destailleur
1eb8833356 Fix total when no data 2020-12-30 23:39:51 +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
e4915d9825 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2020-12-30 22:02:06 +01:00
Laurent Destailleur
40d19e6c36 Fix tooltip on timezone 2020-12-30 22:01:26 +01:00
Laurent Destailleur
ab54d30b57 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
 2020-12-30 21:48:44 +01:00
Laurent Destailleur
79da047802 FIX Dates of sales start in TakePOS 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
 2020-12-30 21:46:40 +01:00
Laurent Destailleur
6ef7d3db79 FIX Dates of sales start in TakePOS 2020-12-30 21:43:04 +01:00
Laurent Destailleur
255b943b99 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/takepos/invoice.php
 2020-12-30 21:25:02 +01:00
Laurent Destailleur
1ec763fc14 FIX When creating a new POS sell, the creation date must be modified. 2020-12-30 21:22:54 +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
Laurent Destailleur
6a63fea184 FIX #15817 2020-12-30 13:00:10 +01:00
Laurent Destailleur
c6c697cb43 Merge pull request #15835 from aspangaro/12p10 
FIX: #15751 Miscellaneous payment type change to 0 after updating subledger account
 2020-12-30 12:42:57 +01:00
Laurent Destailleur
e34fb394a0 Fix warning 2020-12-30 12:38:45 +01:00
Laurent Destailleur
7e9fcfe664 Fix warning 2020-12-30 12:31:33 +01:00
Laurent Destailleur
87a452c6f4 Fix warning 2020-12-30 12:16:01 +01:00
Laurent Destailleur
057ed201a7 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
 2020-12-30 12:08:12 +01:00
Laurent Destailleur
9e04217e35 Merge pull request #15802 from aspangaro/12p9 
FIX: Accountancy - Retire entire opening balance feature
 2020-12-30 11:21:34 +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
057945f693 Fix bad var 2020-12-29 17:04:39 +01:00
Laurent Destailleur
791cbb29c2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2020-12-29 16:55:58 +01:00
Laurent Destailleur
be2e3aa7a9 Merge pull request #15827 from fappels/13_php_warning_add_line 
FIX add line php warning when no customer relative discount history.
 2020-12-29 16:55:33 +01:00
Laurent Destailleur
b066e66c26 Merge pull request #15826 from FHenry/13.0 
fix product/service list right
 2020-12-29 16:54:55 +01:00