Laurent Destailleur
|
4e93fb1e5e
|
Merge pull request #14853 from c3do/patch-16
Fix API $includeparentid when get product
|
2020-09-29 13:34:42 +02:00 |
|
Laurent Destailleur
|
8b2ba8cbba
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/card.php
htdocs/bom/bom_card.php
htdocs/core/class/ldap.class.php
htdocs/core/lib/files.lib.php
htdocs/fichinter/class/fichinterrec.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/admin.lang
|
2020-09-29 13:28:22 +02:00 |
|
Laurent Destailleur
|
29414251f5
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/lib/files.lib.php
|
2020-09-29 13:19:03 +02:00 |
|
Laurent Destailleur
|
1f8f2c0cc3
|
NEW Add 2 rules for emailcollector: Message send/not sent from Dolibarr
|
2020-09-29 13:13:47 +02:00 |
|
Laurent Destailleur
|
a6dcf5f1c1
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-09-29 00:51:02 +02:00 |
|
Cédric
|
572b012344
|
Fix API $includeparentid when get product
|
2020-09-28 22:06:15 +02:00 |
|
Laurent Destailleur
|
628978be53
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/adherents/card.php
|
2020-09-28 21:16:25 +02:00 |
|
Laurent Destailleur
|
43c167f0c8
|
Fix init var
|
2020-09-28 20:47:36 +02:00 |
|
Laurent Destailleur
|
236c9bf1d2
|
Fix regression making export feature not working
|
2020-09-28 20:05:58 +02:00 |
|
Laurent Destailleur
|
bd11154bfc
|
NEW Can filter on accounting system ref in export of chart of account
|
2020-09-28 18:56:53 +02:00 |
|
Laurent Destailleur
|
4cf6e483ca
|
Fix export of various payments.
|
2020-09-28 18:49:20 +02:00 |
|
Laurent Destailleur
|
0093671a04
|
Merge pull request #14846 from aspangaro/13a19
NEW Add export for various payment
|
2020-09-28 17:40:18 +02:00 |
|
Laurent Destailleur
|
0c64b01ae9
|
Merge pull request #14847 from OPEN-DSI/new-emailcollector-mail-header-remove
NEW MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER const in email collector
|
2020-09-28 17:25:49 +02:00 |
|
Laurent Destailleur
|
53b9866d20
|
Merge pull request #14845 from TobiasSekan/FixWrongExpectedTypeInViewcat
FIX wrong expected type for "dol_print_error" in "viewcat.php"
|
2020-09-28 17:23:28 +02:00 |
|
Sekan, Tobias
|
6c1700d84a
|
Fix contratcs are always zero on statistics board
|
2020-09-28 17:22:11 +02:00 |
|
Laurent Destailleur
|
6b4a05cf06
|
Merge pull request #14843 from TobiasSekan/FixContractAlwaysZeroOnStatisticsBoard
FIX Contratcs count are always zero on statistics board
|
2020-09-28 17:21:19 +02:00 |
|
Laurent Destailleur
|
8ae3cabbac
|
Merge pull request #14842 from aspangaro/13a18
Fix - Accountancy - select date on periodicity by default & some fix
|
2020-09-28 17:20:56 +02:00 |
|
Laurent Destailleur
|
2cbec87ddc
|
Update accountancy.lang
|
2020-09-28 17:20:41 +02:00 |
|
Laurent Destailleur
|
c6c2dc53cb
|
Merge pull request #14844 from TobiasSekan/FixCountErrorOnUserCatgories
FIX count error on user categories
|
2020-09-28 17:17:49 +02:00 |
|
Laurent Destailleur
|
1a28d7f641
|
Fix missing token
|
2020-09-28 16:33:27 +02:00 |
|
Laurent Destailleur
|
b61815e95f
|
Typo in action test
|
2020-09-28 16:22:15 +02:00 |
|
Laurent Destailleur
|
9973ffab01
|
Fix sanitizing
|
2020-09-28 13:05:12 +02:00 |
|
Laurent Destailleur
|
a2ad1e2fc9
|
Fix #yogosha4544
|
2020-09-28 12:49:51 +02:00 |
|
Laurent Destailleur
|
2e79064098
|
Clean code
|
2020-09-28 11:07:53 +02:00 |
|
lvessiller
|
7eaf26b09e
|
NEW add MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER const to remove header in email collector
|
2020-09-28 10:14:10 +02:00 |
|
Alexandre SPANGARO
|
88772726d7
|
New Add export for various payment
|
2020-09-28 09:32:49 +02:00 |
|
Sekan, Tobias
|
f810f2c8e4
|
Fix wrong expected type in viewcat.php
|
2020-09-28 09:13:15 +02:00 |
|
Sekan, Tobias
|
e3591a767e
|
fix count error on user categories
|
2020-09-28 08:31:39 +02:00 |
|
Sekan, Tobias
|
10c034efdf
|
Fix contratcs are always zero on statistics board
|
2020-09-28 08:12:12 +02:00 |
|
Alexandre SPANGARO
|
d50932499f
|
Fix select date on periodicity by default
|
2020-09-28 07:03:22 +02:00 |
|
Alexandre SPANGARO
|
347537a205
|
Accountancy - Some fix
|
2020-09-28 06:44:01 +02:00 |
|
Laurent Destailleur
|
57b7666bf1
|
FIX #14326
|
2020-09-27 22:20:24 +02:00 |
|
Laurent Destailleur
|
e7c044cc05
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-09-27 21:20:51 +02:00 |
|
Laurent Destailleur
|
51d0856f50
|
Remove bad exakat rules
|
2020-09-27 21:20:39 +02:00 |
|
Laurent Destailleur
|
1aaf1fe357
|
Try catch on eval
|
2020-09-27 21:10:27 +02:00 |
|
Laurent Destailleur
|
f851ce2f0f
|
Merge pull request #14741 from Tim-Otte/fix-zero-price-lines
FIX: Allow product price equal zero in new lines
|
2020-09-27 20:46:36 +02:00 |
|
Laurent Destailleur
|
e388123a3a
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-09-27 19:32:08 +02:00 |
|
Laurent Destailleur
|
4a7df01339
|
Fix the MAIN_EXTERNAL_SMTP_SPF_STRING_TO_ADD should be
MAIN_EXTERNAL_MAIL_SPF_STRING_TO_ADD
|
2020-09-27 19:31:54 +02:00 |
|
Laurent Destailleur
|
0b82860582
|
Merge pull request #14447 from FHenry/11.0_fixmultidiroutput
fix document.php external module multidiroutput
|
2020-09-27 18:55:21 +02:00 |
|
Laurent Destailleur
|
5c9ad3ec9b
|
Update files.lib.php
|
2020-09-27 18:55:09 +02:00 |
|
Laurent Destailleur
|
44549bbb3b
|
Merge pull request #14802 from FHenry/fix_eventcreation
fix event creation bad redirection from thirdparty/event tab if on first attempt you badly fill the form
|
2020-09-27 18:36:32 +02:00 |
|
Laurent Destailleur
|
d53e7266d2
|
Update agenda.php
|
2020-09-27 18:34:35 +02:00 |
|
Laurent Destailleur
|
8e59d0528e
|
Update html.formactions.class.php
|
2020-09-27 18:33:13 +02:00 |
|
Laurent Destailleur
|
4ca481335b
|
Merge pull request #14812 from atm-john/13.0_new_pdf_storm_for_delivery
NEW PDF model storm for delivery
|
2020-09-27 18:28:22 +02:00 |
|
Laurent Destailleur
|
80b9fa0834
|
Merge pull request #14839 from Dolibarr/revert-14820-new/develop/currency_rate_editor
Revert "NEW Better currency rate editor"
|
2020-09-27 18:20:38 +02:00 |
|
Florian HENRY
|
5ff7e37696
|
review code
|
2020-09-27 18:05:19 +02:00 |
|
Laurent Destailleur
|
96ae9c11f6
|
Revert "NEW Better currency rate editor"
|
2020-09-27 18:03:56 +02:00 |
|
Florian HENRY
|
b6b2553501
|
Merge branch '11.0' into 11.0_fixmultidiroutput
|
2020-09-27 18:02:22 +02:00 |
|
Florian HENRY
|
f9d4a4d2ba
|
Merge branch 'develop' into fix_eventcreation
|
2020-09-27 17:58:05 +02:00 |
|
Laurent Destailleur
|
cdc54a9f4a
|
Merge pull request #14820 from ATM-Consulting/new/develop/currency_rate_editor
NEW Better currency rate editor
|
2020-09-27 17:57:16 +02:00 |
|