lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
93,163 Commits 43 Branches 150 Tags 886 MiB
e4600b2091
Commit Graph

93163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
e4600b2091 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-31 15:17:03 +01:00
Laurent Destailleur
9e8c6eb0a1 FIX #15849 2020-12-31 15:05:17 +01:00
Laurent Destailleur
020caf8809 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-30 23:52:36 +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
42ca3bcdc7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/salaries/class/paymentsalary.class.php
 2020-12-30 13:23:50 +01:00
Laurent Destailleur
cb4a293020 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/webservices/server_productorservice.php
 2020-12-30 13:22:43 +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
92a88441ac
Merge pull request #15328 from FHenry/dev_multifilter_jounal_on_bookeping 
Dev multifilter jounal on bookeping
 2020-12-30 13:19:27 +01:00
Laurent Destailleur
b6e33771be
Update accountancy.lang 2020-12-30 13:19:15 +01:00
Laurent Destailleur
7165bd43d9
Update modAccounting.class.php 2020-12-30 13:17:57 +01:00
Laurent Destailleur
e5da047134
Update index.php 2020-12-30 13:16:38 +01:00
Laurent Destailleur
8149478c77
Merge pull request #15308 from aspangaro/14a2 
NEW: Dictionary for availability - Add column position
 2020-12-30 13:12:27 +01:00
Laurent Destailleur
744bc56953
Merge pull request #15283 from prietojc/12.0.3 
NEW massaction for Bank Transfer
 2020-12-30 13:11:31 +01:00
Laurent Destailleur
279c7923ac
Merge pull request #15807 from OPEN-DSI/new-societe-fomrconfirm-hook 
NEW add form confirm hook on company card
 2020-12-30 13:10:40 +01:00
Laurent Destailleur
6a63fea184 FIX #15817 2020-12-30 13:00:10 +01:00
Laurent Destailleur
03c4e3ecae
Merge pull request #15833 from frederic34/paymentsalary 
add $fields in paymentsalary class
 2020-12-30 12:47:49 +01:00
stickler-ci
a77d0d90ff Fixing style errors. 2020-12-30 11:46:33 +00:00
Laurent Destailleur
1d90717fea
Merge branch '13.0' into paymentsalary 2020-12-30 12:45:57 +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
Frédéric FRANCE
8d526f8f79
remove debug 2020-12-29 21:48:53 +01:00
Frédéric FRANCE
3fe495756b
add $fields in paymentsalary class 2020-12-29 21:44:41 +01:00
Laurent Destailleur
9ab67bf728
Merge pull request #15819 from aspangaro/14a6 
NEW: Accountancy - Format FEC - Add new field DateLimitReglmt
 2020-12-29 17:09:14 +01:00
Laurent Destailleur
00aec1d3fe
Merge pull request #15821 from OPEN-DSI/new-invoice-list-margin-total 
NEW add total margin in invoice list
 2020-12-29 17:07:12 +01:00
Laurent Destailleur
c606e4b943 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-29 17:05:15 +01:00
Laurent Destailleur
01a94d22bb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-29 17:05:07 +01:00
Laurent Destailleur
057945f693 Fix bad var 2020-12-29 17:04:39 +01:00
Laurent Destailleur
740cedeaac
Merge pull request #15824 from frederic34/scheduledjobs 
remove warnings
 2020-12-29 17:03:17 +01:00
Laurent Destailleur
cef2057ff2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/societe/class/societe.class.php
	htdocs/webservices/server_productorservice.php
 2020-12-29 17:01:24 +01:00
Laurent Destailleur
cefd66c18f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-29 16:56: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