Commit Graph

93056 Commits

Author SHA1 Message Date
Laurent Destailleur
9e8c6eb0a1 FIX #15849 2020-12-31 15:05:17 +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
Laurent Destailleur
483ea559f5 Fix warning #15823 2020-12-29 16:54:28 +01:00
Frédéric FRANCE
e4c3499cad remove warnings
Conflicts:
	htdocs/societe/class/societe.class.php
2020-12-29 16:48:29 +01:00
Laurent Destailleur
620a088827 Fix warning 2020-12-29 16:33:58 +01:00
Laurent Destailleur
87da0a276d Doc 2020-12-29 16:13:03 +01:00
Francis Appels
4267828ee6 FIX add line php warning when no customer relative discount history. 2020-12-29 14:47:16 +01:00
Laurent Destailleur
ae7d3abdc5 css 2020-12-29 05:00:51 +01:00
Laurent Destailleur
abca44be0d More logs 2020-12-29 04:52:47 +01:00
Laurent Destailleur
f498657071 Fix warning 2020-12-29 04:44:48 +01:00
Laurent Destailleur
bf0a9fa137 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/societe/class/societe.class.php
2020-12-29 04:32:13 +01:00
Laurent Destailleur
c3326a0963 FIX Creation of thirdparty when setup is empty 2020-12-29 04:30:37 +01:00
Laurent Destailleur
af41c06822 Fix warnings 2020-12-29 04:27:16 +01:00
Laurent Destailleur
7b93c34c0f Fix phpunits 2020-12-29 03:48:11 +01:00
Laurent Destailleur
e07486b626 Fix columns of download of list of targets of emailing 2020-12-29 02:20:10 +01:00
Laurent Destailleur
d9a2e2e402 Responsive 2020-12-29 02:06:42 +01:00
Florian HENRY
af860a32bc fix product right 2020-12-28 21:19:25 +01:00
Laurent Destailleur
b7cd27e76a Fix warning 2020-12-28 12:42:55 +01:00
Laurent Destailleur
8b696ced3b Clean code 2020-12-28 12:38:33 +01:00
Laurent Destailleur
7c3688c66f Fix var not defined 2020-12-28 12:36:36 +01:00
Laurent Destailleur
4b3cd947f2 Fix name of function 2020-12-28 12:33:00 +01:00
Laurent Destailleur
cec96b33ae Fix warning 2020-12-28 12:30:59 +01:00
Alexandre SPANGARO
49a1268ba1 Merge branch '12.0' into 12p9 2020-12-28 03:12:57 +01:00
Alexandre SPANGARO
26791714ce Fix : Introduce constant ACCOUNTANCY_SHOW_OPENING_BALANCE 2020-12-28 03:07:33 +01:00
Laurent Destailleur
eac711f96c Debug v13 2020-12-27 21:41:39 +01:00
Laurent Destailleur
6421f757dc FIX Can delete a directory created manually that can not be indexed 2020-12-27 21:21:13 +01:00