Sekan, Tobias
|
9c54f8831f
|
Show bank only when active (on new)
|
2020-08-28 13:08:04 +02:00 |
|
Sekan, Tobias
|
216e22e505
|
Show bank only when bank module is active
|
2020-08-28 12:53:30 +02:00 |
|
Florian Mortgat
|
7ddf85cd33
|
Merge branch '11.0' into 11.0_FIX_11858_do_not_allow_lines_to_overlap_infotot
|
2020-08-28 10:05:00 +02:00 |
|
Florian Mortgat
|
a5d1f1f68f
|
FIX: expenses lines overlapping the frame for total amounts.
If there is no room for this frame when printing the last expense line, this line should be on a new page.
|
2020-08-28 10:02:43 +02:00 |
|
atm-lena
|
6562334f7b
|
FIX sendEmailsReminder() function
|
2020-08-28 09:37:18 +02:00 |
|
Laurent Destailleur
|
30838f01d4
|
Fix warning
|
2020-08-27 22:03:52 +02:00 |
|
Laurent Destailleur
|
d40f90fecb
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-08-27 22:00:38 +02:00 |
|
Laurent Destailleur
|
ad63434f3e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/compta/prelevement/index.php
|
2020-08-27 22:00:10 +02:00 |
|
Laurent Destailleur
|
e52d71a880
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-08-27 21:58:29 +02:00 |
|
Laurent Destailleur
|
00fce1d18a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-08-27 21:58:23 +02:00 |
|
Laurent Destailleur
|
4ecd15b7ab
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/main.lang
|
2020-08-27 21:57:42 +02:00 |
|
Laurent Destailleur
|
57951e1285
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-08-27 21:52:47 +02:00 |
|
Laurent Destailleur
|
c6bdd27d4c
|
FIX #14530
|
2020-08-27 21:52:25 +02:00 |
|
Laurent Destailleur
|
8f34f4c1c5
|
FIX #14530
|
2020-08-27 21:46:28 +02:00 |
|
Laurent Destailleur
|
1b77dc4e13
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-08-27 21:19:06 +02:00 |
|
Laurent Destailleur
|
c419e2f0de
|
Sanitize vars
|
2020-08-27 21:18:49 +02:00 |
|
Laurent Destailleur
|
fe4acf4e4e
|
NEW Add focus when editing on product/stock/product.php Close #14548
|
2020-08-27 21:18:40 +02:00 |
|
Laurent Destailleur
|
4624cf98ee
|
Merge pull request #14545 from cfoellmann/defaults-payment-selections
FIX allow use of default settings for payment term and condition on proposal creation
|
2020-08-27 21:04:10 +02:00 |
|
Laurent Destailleur
|
f997d11761
|
Update card.php
|
2020-08-27 21:02:01 +02:00 |
|
Laurent Destailleur
|
7730569dff
|
Update card.php
|
2020-08-27 21:00:01 +02:00 |
|
Laurent Destailleur
|
593f3b81e5
|
Merge pull request #14559 from OPEN-DSI/v10-fix-societe-card-add-sales-representatives
FIX set sales representatives on create company card
|
2020-08-27 20:14:31 +02:00 |
|
Laurent Destailleur
|
f4793f505e
|
Merge pull request #14532 from StephaneLesage/import-thirdparty-mothercompany-debtlimit-bank-incoterms
NEW Third-Party Import new fields: mother company,outstanding debt limit,bank account,incoterms
|
2020-08-27 20:12:36 +02:00 |
|
Laurent Destailleur
|
9f8d1f0e63
|
Merge pull request #14520 from TobiasSekan/ShowUserOnExternalCalenderEvents
NEW Show user on external calender events (when found)
|
2020-08-27 20:10:13 +02:00 |
|
Laurent Destailleur
|
b6e9ba8ed6
|
Merge pull request #14535 from aspangaro/13a6
Some fix on assets
|
2020-08-27 20:01:33 +02:00 |
|
Laurent Destailleur
|
af36f9c784
|
Merge pull request #14531 from andreubisquerra/master
NEW: Print payment method and change in TakePOS
|
2020-08-27 20:00:34 +02:00 |
|
Laurent Destailleur
|
3b4508b44f
|
Update paiement.class.php
|
2020-08-27 19:59:46 +02:00 |
|
Laurent Destailleur
|
5c1680e9c5
|
Merge branch 'develop' into master
|
2020-08-27 19:58:29 +02:00 |
|
Laurent Destailleur
|
e95361fed4
|
Merge pull request #14536 from ptibogxiv/patch-347
Fix for better code
|
2020-08-27 19:57:34 +02:00 |
|
Laurent Destailleur
|
a3e94a670b
|
Merge pull request #14554 from bb2a/filter_warehous_order
Remove warehouse search
|
2020-08-27 19:56:55 +02:00 |
|
Laurent Destailleur
|
094b2e84a6
|
Merge pull request #14566 from TobiasSekan/FixEmptyRefInContractListToolTip
FIX - Empty references in contract service list tool tip
|
2020-08-27 19:54:37 +02:00 |
|
Laurent Destailleur
|
829ef1ae0b
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-08-27 19:52:21 +02:00 |
|
Laurent Destailleur
|
741489fdc0
|
FIX #14564
|
2020-08-27 19:52:05 +02:00 |
|
Laurent Destailleur
|
dda5775dd6
|
Merge pull request #14563 from atm-florianm/11.0_FIX_prelevement_top5_multicompany
FIX: missing entity check
|
2020-08-27 19:46:45 +02:00 |
|
Laurent Destailleur
|
84a096e234
|
Merge pull request #14555 from aspangaro/12.0p8
Fix Accountancy Listbyaccount Error missing class on formfile->getDocumentsLink
|
2020-08-27 19:45:55 +02:00 |
|
Laurent Destailleur
|
8a9244d1d6
|
Merge pull request #14567 from TobiasSekan/ShowRefInContractFormOnInterventions
NEW - Show references in contract form on interventions
|
2020-08-27 19:44:51 +02:00 |
|
Laurent Destailleur
|
6715eaee09
|
Update html.formcontract.class.php
|
2020-08-27 19:44:17 +02:00 |
|
Laurent Destailleur
|
57c8835fcc
|
Merge pull request #14565 from atm-john/develop_fix_14562
Fix #14562 Unable to create table `llx_product_attribute_combination_price_level` upon clean install
|
2020-08-27 19:42:50 +02:00 |
|
Laurent Destailleur
|
a80950dfa4
|
Fix regression
|
2020-08-27 19:41:32 +02:00 |
|
Laurent Destailleur
|
8b95aa63eb
|
Trans
|
2020-08-27 18:59:36 +02:00 |
|
Laurent Destailleur
|
0309510ab8
|
Fix avoid duplicate event recorded from email collector
|
2020-08-27 18:50:08 +02:00 |
|
Laurent Destailleur
|
2abdfe08d7
|
FIX Email collector decode subject
FIX Cloning email collector clone also rules and operations
|
2020-08-27 18:27:05 +02:00 |
|
atm-lena
|
c0f254d10c
|
Translation + decode
|
2020-08-27 16:03:25 +02:00 |
|
atm-lena
|
e3ce3cbb7c
|
Function sendEmailsReminder()
|
2020-08-27 15:49:56 +02:00 |
|
atm-lena
|
f57325237a
|
WIP : sendEmailsReminder()
|
2020-08-27 12:30:59 +02:00 |
|
atm-lena
|
acb50950a4
|
Add a default message to "actioncomm_send" template
|
2020-08-27 11:31:48 +02:00 |
|
atm-lena
|
5856033892
|
Replace "agenda_send" and "event_push" to "actioncomm_send"
|
2020-08-27 11:15:08 +02:00 |
|
atm-lena
|
69459e3429
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind
|
2020-08-27 11:13:21 +02:00 |
|
Laurent Destailleur
|
180a49601b
|
Use CSS to define size of logo on public pages.
|
2020-08-27 11:01:41 +02:00 |
|
stickler-ci
|
b0fe7bc2e0
|
Fixing style errors.
|
2020-08-27 08:47:57 +00:00 |
|
atm-lena
|
4ef2644300
|
Use date.lib.php functions
|
2020-08-27 10:29:23 +02:00 |
|