Commit Graph

93200 Commits

Author SHA1 Message Date
Laurent Destailleur
5c3e543bf9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-01 20:58:24 +01:00
Laurent Destailleur
48e9c28420 Fix warning 2021-01-01 20:56:34 +01:00
Laurent Destailleur
d11b34c935
Merge pull request #15338 from prietojc/develop_patch-1
NEW: ICS Direct debit per each bank account
2021-01-01 20:53:21 +01:00
Laurent Destailleur
71e4a672f5
Merge branch 'develop' into develop_patch-1 2021-01-01 20:52:43 +01:00
Laurent Destailleur
f756f575a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-31 15:19:49 +01:00
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
stickler-ci
327ec211c4 Fixing style errors. 2020-12-31 09:49:27 +00:00
JC Prieto
af82bf2fee
Update create.php 2020-12-31 10:47:30 +01:00
jcp
e187e77acb ICS and ICS_transfer hide if module not enabled 2020-12-31 10:12:03 +01:00
Laurent Destailleur
ee38568eab
Merge pull request #15434 from FHenry/dev_default_date_filter_module_builder
NEW Dev default date filter module builder
2020-12-31 00:10:08 +01:00
Laurent Destailleur
b93c3676d0
Merge pull request #15339 from aspangaro/14a3
Dev multifilter journal on ledger (complete)
2020-12-30 23:59:02 +01:00
Laurent Destailleur
4768bfe2a5
Merge pull request #15844 from frederic34/adminexpensereport
remove deprecated
2020-12-30 23:58:05 +01:00
Laurent Destailleur
37b2046254
Merge pull request #15839 from frederic34/patch-10
Update paiement.php
2020-12-30 23:56:21 +01:00
Laurent Destailleur
215403dc87
Merge pull request #15838 from frederic34/patch-8
phpcs
2020-12-30 23:55:44 +01:00
Laurent Destailleur
dd18495c78
Merge pull request #15841 from frederic34/ldap2dolibarr
societe_id to socid
2020-12-30 23:55:24 +01:00
Laurent Destailleur
64450a8b02
Merge pull request #15842 from frederic34/animtooltipspeed
modify animation speed of tooltips
2020-12-30 23:54:43 +01:00
Laurent Destailleur
bdb261b803
Merge pull request #15840 from frederic34/accountancyadminindex
remove whitespace
2020-12-30 23:53:17 +01:00
Laurent Destailleur
ba02ad5fe3
Merge pull request #15843 from frederic34/subscriptionclass
doxygen
2020-12-30 23:53:03 +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
Frédéric FRANCE
f5641f8068
remove deprecated 2020-12-30 22:15:34 +01:00
Frédéric FRANCE
786e251961
remove deprecated 2020-12-30 22:13:43 +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
Frédéric FRANCE
02d92d3538
remove deprecated 2020-12-30 21:53:17 +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
Frédéric FRANCE
94e859bf6a
doxygen 2020-12-30 21:41:44 +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
Frédéric FRANCE
a5e0352031
modify animation speed of tooltips 2020-12-30 21:18:12 +01:00
Frédéric FRANCE
1620ab3118
societe_id to socid 2020-12-30 20:47:57 +01:00
Frédéric FRANCE
9916335d93
remove whitespace 2020-12-30 19:17:28 +01:00
Frédéric FRANCE
123101542b
Update paiement.php 2020-12-30 19:13:20 +01:00
Frédéric FRANCE
39ff3d3190
phpcs 2020-12-30 19:07:46 +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