lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
91,219 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-1
Commit Graph

80319 Commits

Author SHA1 Message Date
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
Nicolas
e58d0d4af4 FIX Stickler error 2020-09-28 20:56:19 +02:00
Nicolas
848ee9decf FIX Stickler error 2020-09-28 20:49:51 +02:00
Laurent Destailleur
43c167f0c8 Fix init var 2020-09-28 20:47:36 +02:00
Nicolas
dfba9a06ad NEW Field to link website page to an other object 2020-09-28 20:39:02 +02:00
Inovea Conseil
789defa46f Merge remote-tracking branch 'Dolibarr/develop' into newfieldwebsite 2020-09-28 20:08:22 +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
Florian
bdb38da9d3 Add 2 new field typeObject and ObjectId to website 2020-09-28 18:17:23 +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
lvessiller
1b5a0ce3bf FIX uses price2numjs 2020-09-28 17:04:20 +02:00
Cédric
3bc9c49307
Update api_orders.class.php 2020-09-28 16:57:30 +02:00
atm-greg
988a532bed fix br 2020-09-28 16:37:17 +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
Alexandre SPANGARO
17347bf575 New Add column vat rate in page to define accounting account on product/service 2020-09-28 11:08:27 +02:00
Laurent Destailleur
2e79064098 Clean code 2020-09-28 11:07:53 +02:00
Sekan, Tobias
2bf15b3a92 Show category filter only on rights to read it 2020-09-28 10:42:49 +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
bf167ca91d Fix unused variable 2020-09-28 09:40:55 +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
andreubisquerra
12b2c33895
Footer removed 2020-09-27 22:22:56 +02:00
Laurent Destailleur
57b7666bf1 FIX #14326 2020-09-27 22:20:24 +02:00
andreubisquerra
80641e54c9
Footer removed 2020-09-27 22:19:49 +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
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
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
Laurent Destailleur
e495d0459e Look and feel v13 2020-09-27 17:53:17 +02:00
Laurent Destailleur
c659379307 Try a more complete fix than #14821 2020-09-27 17:21:49 +02:00
Laurent Destailleur
cb6e4d131f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-27 17:13:41 +02:00
Laurent Destailleur
ca8d9613ce
Merge pull request #14821 from cfoellmann/fix-pricestable 
fix selectbox for table columns supplier prices
 2020-09-27 17:12:37 +02:00
Laurent Destailleur
8157526778
Merge pull request #14822 from TobiasSekan/FixUnbeautifulErrorOnIntervention 
FIX Unbeautiful error messages on intervention
 2020-09-27 17:08:36 +02:00
Laurent Destailleur
52d1f57276
Merge pull request #14828 from TobiasSekan/NewAllowReopenIntervention 
NEW Allow to reopen interventions (green button)
 2020-09-27 17:07:45 +02:00
Laurent Destailleur
dcca79e368 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-27 16:59:39 +02:00
Laurent Destailleur
d60ab93783 Typo 2020-09-27 16:59:27 +02:00
Laurent Destailleur
10ce4029d7
Merge pull request #14831 from hregis/12.0_ldap 
FIX Can create user but not update user with activedirectory
 2020-09-27 16:58:33 +02:00
Laurent Destailleur
164af8bdea
Merge pull request #14829 from TobiasSekan/NewShowLineNumberOnInterventionCard 
NEW Show line number on intervention card (via MAIN_VIEW_LINE_NUMBER)
 2020-09-27 16:58:08 +02:00
Laurent Destailleur
43cc009b54 Typo 2020-09-27 16:27:42 +02:00
Laurent Destailleur
3ee2459dc7 Enhancement for #14835: Can filter on expiration date, add list of 
members without subscriptions
 2020-09-27 16:03:20 +02:00
Laurent Destailleur
5d0c40c658 FIX for #14835 2020-09-27 15:08:15 +02:00
andreubisquerra
494348356a
Fix travis 2020-09-27 11:35:07 +02:00
jove@bisquerra.com
ec54e33d81 NEW: Introducing new modal boxes in TakePOS 2020-09-27 11:11:31 +02:00
Laurent Destailleur
ba311e2cfd Fix phpcs 2020-09-26 21:24:28 +02:00
Laurent Destailleur
da4362c492 Make notification by browser popup working. 2020-09-26 21:18:09 +02:00
Laurent Destailleur
3a6b8ae202 Work on browser notification 2020-09-26 20:29:01 +02:00
Laurent Destailleur
7865381434 Clean code 2020-09-26 12:19:08 +02:00
Laurent Destailleur
9d6e3be5d1 Fix #yogosha4463 2020-09-26 05:20:33 +02:00
Laurent Destailleur
68a6239322 Clean code 2020-09-26 04:25:14 +02:00
Laurent Destailleur
33d578a660 Fix bad management of default value in database on create form 2020-09-26 04:25:06 +02:00
Laurent Destailleur
611684a9a7 FIX Substitution for member subscription was not done 2020-09-26 02:39:19 +02:00
Laurent Destailleur
e2b0c4bc41 css 2020-09-26 02:27:27 +02:00
Laurent Destailleur
d3e9815cfa Fix phpunit 2020-09-25 17:48:04 +02:00
Laurent Destailleur
48632bbb3f Clean code 2020-09-25 17:23:42 +02:00
Laurent Destailleur
1b83b55995 Fix to exclude possible sql injection 2020-09-25 17:11:54 +02:00
Laurent Destailleur
0d797a793a On technical error, return http code 500 2020-09-25 15:01:15 +02:00
root
fcbc48fa28 Bug fix last_gen should be date_last_gen 2020-09-25 14:24:26 +02:00
Laurent Destailleur
d9e7cacc84 Fix search 2020-09-25 14:16:59 +02:00
Laurent Destailleur
88b4c1e766 Fix calculation of nb of top menu in CSS files. 2020-09-25 14:09:51 +02:00
Laurent Destailleur
0dcd85485a Fix migration 2020-09-25 12:36:32 +02:00
Laurent Destailleur
7a9332815c Fix migration 2020-09-25 12:22:24 +02:00
Regis Houssin
f92f8d0fc4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-25 12:11:37 +02:00
Regis Houssin
d38c557fba FIX Can create user but not update user with activedirectory 2020-09-25 12:11:13 +02:00
Laurent Destailleur
3c6dda9dd5 Clean code 2020-09-25 10:27:30 +02:00
Laurent Destailleur
83bdd530cd Fix sql error in menu edition, column too short 2020-09-25 10:13:45 +02:00
Laurent Destailleur
d6ce6bb47f Standardize code 2020-09-25 10:05:59 +02:00
Sekan, Tobias
4210a2cfa1 New Show line number on intervention card 2020-09-25 08:25:24 +02:00
stickler-ci
6e2d12413c Fixing style errors. 2020-09-25 06:17:52 +00:00
Sekan, Tobias
6fbc536061 Remoeve double lang entry 2020-09-25 08:15:20 +02:00
Sekan, Tobias
00951a8144 New allow to reopen interventions 2020-09-25 08:10:48 +02:00
Laurent Destailleur
4fe0300701 phpcs 2020-09-24 22:17:09 +02:00
Laurent Destailleur
ed2dd3f55f Clean code 2020-09-24 22:02:10 +02:00
Laurent Destailleur
6e2a9dc0c9 Fix error management in Stripe 2020-09-24 21:54:21 +02:00
Laurent Destailleur
bc7b5b1468 Update website templates for v13 2020-09-24 21:37:21 +02:00
Laurent Destailleur
64c8053b67 Fix restrict extension of files 2020-09-24 21:09:58 +02:00
Laurent Destailleur
72e9e1b387 Fix asset module 2020-09-24 17:37:57 +02:00
Laurent Destailleur
9a831e3249 Fix permission test 2020-09-24 17:24:23 +02:00
Laurent Destailleur
ca7b9efec2 Add missing token 2020-09-24 17:08:31 +02:00
Laurent Destailleur
f066da1811 Minor security fixes 2020-09-24 16:19:24 +02:00
Laurent Destailleur
2404856409 Fix sql inj 2020-09-24 15:38:27 +02:00
atm-greg
554948d3e2 bad user for getNomUrl 2020-09-24 15:34:52 +02:00
atm-greg
5244c05abb reminders in the future can be displayed too 2020-09-24 15:30:29 +02:00
atm-greg
6aad3b47f5 remove fields size modification 2020-09-24 15:28:41 +02:00
atm-greg
b269af5bf6 delete reminders on ActionComm::delete 2020-09-24 15:26:35 +02:00
atm-greg
e6eff6511e fix reminder offsetunit and display problems 2020-09-24 15:20:30 +02:00
stickler-ci
efd8ffe390 Fixing style errors. 2020-09-24 11:29:30 +00:00
Sekan, Tobias
56dd28ca78 fix wrong color 2020-09-24 13:25:40 +02:00
Sekan, Tobias
3c879ddd34 Fix unbeautiful error message on intervention 2020-09-24 13:15:51 +02:00
Laurent Destailleur
0e820d4c2b FIX link to home in takepos 2020-09-24 13:00:56 +02:00
atm-greg
101405b052 fix notification creation => must create for every user linked to the event 2020-09-24 12:31:28 +02:00
Christian Foellmann
be05a44860 fix selectbox for table columns supplier prices 2020-09-24 11:49:59 +02:00
atm-greg
732bb70826 fix sql 2020-09-24 11:47:41 +02:00
stickler-ci
3c48d2933c Fixing style errors. 2020-09-24 08:08:15 +00:00
ptibogxiv
6a85fdbd7f
Update list.php 2020-09-24 10:06:35 +02:00
Laurent Destailleur
becf91904f css 2020-09-24 08:55:33 +02:00
Laurent Destailleur
1d6a4f528a Fix css 2020-09-24 00:07:55 +02:00
Laurent Destailleur
a16788f753 Fix syntax error 2020-09-24 00:06:02 +02:00
Laurent Destailleur
ece46511f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-23 23:02:52 +02:00
Laurent Destailleur
95cf3d2f51 NEW Can use desired stock of a given warehouse for replenishment 2020-09-23 23:02:31 +02:00
ptibogxiv
ca07b19796
Update list.php 2020-09-23 22:39:24 +02:00
ptibogxiv
5f8f9c6a4a
NEW restrict thirdparty to customer in takepos 
only display customer (better when long list and avoid supplier)
 2020-09-23 22:38:06 +02:00
Laurent Destailleur
28d25f596b
Merge pull request #14671 from Tim-Otte/feature-add-incoterms-to-odt 
NEW: Added incoterms to substitution array
 2020-09-23 20:10:22 +02:00
Laurent Destailleur
6f919f1dd0
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 20:02:48 +02:00
Laurent Destailleur
93af72c272
Merge pull request #14805 from hansemschnokeloch/patch-1 
Fix label inversion
 2020-09-23 19:53:35 +02:00
Laurent Destailleur
fb68a71f77
Merge pull request #14808 from TobiasSekan/FixFicinterGlobalSearch 
FIX Not working global search on interventions by description
 2020-09-23 19:53:12 +02:00
Laurent Destailleur
c4145b7922
Merge pull request #14798 from andreubisquerra/master 
NEW Show available stock in TakePOS
 2020-09-23 19:50:49 +02:00
Laurent Destailleur
32a93eb067
Update invoice.php 2020-09-23 19:50:39 +02:00
Laurent Destailleur
5a93628611
Merge pull request #14806 from hregis/12_bug 
FIX missing field entity
 2020-09-23 19:45:05 +02:00
Laurent Destailleur
80ec1ad69f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-23 19:29:07 +02:00
Laurent Destailleur
905f676c71 Fix 12.0.3 2020-09-23 19:27:55 +02:00
Laurent Destailleur
306f61d04d
Merge pull request #14811 from zecsn/patch-1 
Fix SQL Error
 2020-09-23 19:25:32 +02:00
Laurent Destailleur
0cced26e46 fix phpunit 2020-09-23 19:23:33 +02:00
Laurent Destailleur
693a8430a5 Prepare 12.0.4 2020-09-23 19:17:36 +02:00
Laurent Destailleur
bb10379768 NEW Can change a product in line of recurring invoice or contract 2020-09-23 18:45:19 +02:00
Laurent Destailleur
72b5c3253b Clean code 2020-09-23 18:01:17 +02:00
Laurent Destailleur
06da242200 css 2020-09-23 16:43:25 +02:00
Laurent Destailleur
09c6761dae NEW Include the tag editor of page as a popup into website editor 2020-09-23 16:36:19 +02:00
Florian Mortgat
70a0b6b90f Merge branch 'new/11.0_multicurrency_rate_editor' into new/develop/currency_rate_editor 2020-09-23 16:03:10 +02:00
stickler-ci
f6513b898d Fixing style errors. 2020-09-23 13:37:35 +00:00
John Botella
a374ffd03a Merge branch '13.0_new_pdf_storm_for_delivery' of github.com:atm-john/dolibarr into 13.0_new_pdf_storm_for_delivery 2020-09-23 15:35:37 +02:00
John Botella
4a65b23bbf Fix missing fetch optionals 2020-09-23 15:35:17 +02:00
stickler-ci
9cc87e8a0c Fixing style errors. 2020-09-23 13:23:19 +00:00
John Botella
d3c9a035e9 Add new PDF model storm for delivery 2020-09-23 15:18:53 +02:00
Florian Mortgat
f98ea5b8ad +token for _actionDelete 2020-09-23 15:13:33 +02:00
Florian Mortgat
7822dacbb8 cleanup: remove commented code 2020-09-23 14:23:17 +02:00
Florian Mortgat
f97e9e4330 FIX: URL parameters vs. POST, tokens, use class CurrencyRate for CRUD 2020-09-23 14:22:27 +02:00
zecsn
98dc0bbb6e
Reformat comments 2020-09-23 16:53:04 +05:00
zecsn
a4c8a5a69d
Fix SQL Error 
Fix SQL Error DB_ERROR_SYNTAX on Installation
 2020-09-23 16:43:53 +05:00
stickler-ci
a88c0b97a8 Fixing style errors. 2020-09-23 11:31:17 +00:00
Sekan, Tobias
815d0c2589 Fix that a admin can remove all his user rights 2020-09-23 13:18:09 +02:00
Laurent Destailleur
d9dce98185 css 2020-09-23 12:36:37 +02:00
atm-lena
0fc6e9b84f FIX - Backtick not work with postgresql 2020-09-23 10:54:49 +02:00
Sekan, Tobias
16e23797da Fix not working global search on fichinter by desc 2020-09-23 09:51:16 +02:00
stickler-ci
e037f2e5c7 Fixing style errors. 2020-09-23 07:11:59 +00:00
Tobias Sekan
a72519f353
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 09:09:42 +02:00
Sekan, Tobias
638c586a05 Merge branch 'PreselectThirpartyOnNewFromList' of https://github.com/TobiasSekan/dolibarr into PreselectThirpartyOnNewFromList 2020-09-23 08:59:45 +02:00
Sekan, Tobias
ce6758657a Fix visiblity when came from Extended POS + doc 2020-09-23 08:59:30 +02:00
Florian Mortgat
69385e6fbf FIXME: conflits params URL et POST 2020-09-22 18:44:45 +02:00
Florian Mortgat
592789c597 Exchange rate editor: +filters 2020-09-22 18:34:59 +02:00
Laurent Destailleur
85fc471d3d Fix phpunit 2020-09-22 18:15:49 +02:00
stickler-ci
06d41c029d Fixing style errors. 2020-09-22 14:41:28 +00:00
Cédric
2dc148eae0
$accepthigherpayment (tested and work) 
Accept higher payments that it remains to be paid
 2020-09-22 16:38:59 +02:00
Regis Houssin
fcfe5423f4 FIX missing field entity 2020-09-22 16:34:38 +02:00
Laurent Destailleur
e4bd75dbdc Enhancement for #14589 2020-09-22 16:26:53 +02:00
Florian Mortgat
b3f911f810 WIP: rate editor 2020-09-22 16:10:28 +02:00
Laurent Destailleur
72a9cf8820 FIX #14751 2020-09-22 16:03:36 +02:00
Laurent Destailleur
288fd5566f FIX #14776 2020-09-22 16:02:00 +02:00
Laurent Destailleur
5a1c05735f Fix phpcs 2020-09-22 15:55:30 +02:00
Laurent Destailleur
fea6fca7d1 Fix phpunit 2020-09-22 15:31:09 +02:00
Laurent Destailleur
6c06d2f0aa Look and feel v13 2020-09-22 15:26:29 +02:00
Laurent Destailleur
d21ee07afc NEW Can define date range of validity of a login during creation 2020-09-22 14:45:19 +02:00
Tim Otte
e373de91d9 Fixed a bug where a price equal zero would be replaced with the product price 2020-09-22 14:43:09 +02:00
Pascal Hubrecht
6d7f5ef0a8
Fix label inversion 
Private and public labels where inverted.
 2020-09-22 12:40:26 +02:00
Laurent Destailleur
5f4547bf7c Prepare table for future features 2020-09-22 10:38:16 +02:00
Laurent Destailleur
830bc7d871 Look and feel v13 2020-09-22 09:42:44 +02:00
Laurent Destailleur
c61e8f052b NEW Add property cssview when declaring fields of an object 2020-09-22 08:54:40 +02:00
Laurent Destailleur
aee6bc173f WIP Add start/end date of validity for user/logins 2020-09-21 18:44:20 +02:00
Florian Mortgat
bd4db13f90 NEW: rate editor for multicurrency 2020-09-21 17:42:20 +02:00
Laurent Destailleur
718497915c Enhance the IK module 2020-09-21 16:31:51 +02:00
Laurent Destailleur
438e884c01 Fix phpcs 2020-09-21 14:17:05 +02:00
Laurent Destailleur
c4ef21a8f2 Increase timeout delay for install 2020-09-21 14:04:46 +02:00
Laurent Destailleur
84cc04a2c6 Increase timeout delay for install 2020-09-21 14:04:07 +02:00
Laurent Destailleur
e52559783f Look and feel v13 2020-09-21 13:54:26 +02:00
Laurent Destailleur
3e977bc5d6 Fix css 2020-09-21 12:55:06 +02:00
Laurent Destailleur
43ed2c6c20 Fix phpunit 2020-09-21 12:35:20 +02:00
Laurent Destailleur
3ca379c9e6 FIX Restore multiselect (selection of prospect level) 
Conflicts:
	htdocs/core/class/html.form.class.php
 2020-09-21 12:22:57 +02:00
Laurent Destailleur
6380a294fc FIX Restore multiselect (selection of prospect level) 2020-09-21 12:16:22 +02:00
Florian HENRY
1efec17228 remove commented code since 3 years 2020-09-21 11:53:09 +02:00
Florian HENRY
0adca0a660 fix event creation same on all page 2020-09-21 11:43:08 +02:00
stickler-ci
4cbe8d8623 Fixing style errors. 2020-09-21 07:34:00 +00:00
x
2fbb6b1125 new handle trigger method 2020-09-21 09:29:52 +02:00
Tim Otte
05275a2b67 Added check if method exists 2020-09-21 08:50:39 +02:00
Laurent Destailleur
d5d187c793 Fix phpunit 2020-09-21 01:31:35 +02:00
Laurent Destailleur
9f41f90eeb Fix responsive 2020-09-21 01:28:26 +02:00
jove@bisquerra.com
c596f80fd5 NEW Show available stock in TakePOS 2020-09-20 23:29:59 +02:00
Laurent Destailleur
43376b3abc Removed warning 2020-09-20 21:27:11 +02:00
Laurent Destailleur
906e030bfb Removed warning 2020-09-20 21:25:18 +02:00
Laurent Destailleur
cda101238d Fix #yogosha4543 2020-09-20 21:17:27 +02:00
Laurent Destailleur
2137901b0b Fix sanitizing 2020-09-20 20:49:26 +02:00
Laurent Destailleur
b4b0d682b8 css 2020-09-20 20:35:22 +02:00
Laurent Destailleur
5f6dc40d6b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-20 19:56:03 +02:00
Laurent Destailleur
2fcc0791ac Fix regression on backtopage 2020-09-20 19:55:44 +02:00
Laurent Destailleur
19141b3eb9
Merge pull request #14633 from c3do/patch-6 
NEW Improve Product API for variant products
 2020-09-20 19:34:12 +02:00
Laurent Destailleur
9522b12da1
Update api_products.class.php 2020-09-20 19:33:18 +02:00
Laurent Destailleur
b2f8c4c6b8 Escape output 2020-09-20 19:21:04 +02:00
Laurent Destailleur
e6fc9d3b5e NEW Add message in error_log after detection of SQL or script injection 2020-09-20 19:20:34 +02:00
Laurent Destailleur
d5e6273b45 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-20 18:06:04 +02:00
Laurent Destailleur
ad1d60740b Fix string 2020-09-20 18:05:49 +02:00
Laurent Destailleur
acf28e28af Label 2020-09-20 18:01:17 +02:00
Laurent Destailleur
ab94224d0c
Merge pull request #14668 from OPEN-DSI/email_smtp_allow_auto_signed 
NEW : Email configuration - Allow auto signed certificat when smtp ssl activated
 2020-09-20 17:56:23 +02:00
Laurent Destailleur
c5aff1769a
Merge pull request #14631 from c3do/patch-3 
NEW ref_ext for Attributes and Combinations
 2020-09-20 17:50:51 +02:00
Laurent Destailleur
a6a2c6cfe1
Merge pull request #14748 from andreubisquerra/master 
Show buttons on products when 'Hide Product Images' is enabled
 2020-09-20 17:43:35 +02:00
Laurent Destailleur
a3defd621c
Merge pull request #14726 from aspangaro/13a15 
Fix display on quickadd dropdown menu
 2020-09-20 17:30:35 +02:00
Laurent Destailleur
a211e3aa93
Merge pull request #14774 from TobiasSekan/FixWrongVisibilityOfCommercialMainMenu 
FIX wrong visibility of commercial main menu
 2020-09-20 17:21:14 +02:00
Laurent Destailleur
dccdfd3a53
Merge pull request #14766 from ptibogxiv/patch-361 
FIx  product list
 2020-09-20 17:18:29 +02:00
Laurent Destailleur
40d894a610
Merge pull request #14768 from atm-gauthier/develop_new_hooks_in_stats_pages 
NEW : add hooks on stats pages
 2020-09-20 17:17:44 +02:00
Laurent Destailleur
ba69fab76a
Merge pull request #14780 from ptibogxiv/patch-363 
NEW fetch contact by email with REST API
 2020-09-20 17:17:03 +02:00
Laurent Destailleur
4f2623ee81
Merge pull request #14779 from ptibogxiv/patch-362 
NEW create thirdparty customer from TAKEPOS
 2020-09-20 17:16:38 +02:00
Laurent Destailleur
b024ce799c
Merge pull request #14782 from b92/patch-1 
FIX: Members substitution variable not substituted if empty
 2020-09-20 17:13:29 +02:00
Laurent Destailleur
aba6fbb306
Merge pull request #14791 from andreubisquerra/develop 
Avoid errors when Weighing Scale from the cloud in TakePOS
 2020-09-20 17:12:48 +02:00
Laurent Destailleur
b4137392ea
Merge pull request #14789 from bafbes/abb120144 
fix:remove deleted user params
 2020-09-20 17:12:15 +02:00
Laurent Destailleur
27e81ed40c
Merge pull request #14793 from daraelmin/add-daraelmin-search_categ 
Fix Category is lost on sorting member list
 2020-09-20 17:10:00 +02:00
Laurent Destailleur
4ce7507518 Fix warnings 2020-09-20 17:06:53 +02:00
Laurent Destailleur
cd8ebd9500 Fix warnings 2020-09-20 16:57:53 +02:00
Laurent Destailleur
b3dd51b790 Fix warnings 2020-09-20 16:46:29 +02:00
Laurent Destailleur
2fca5e928b Fix comment 2020-09-20 16:13:20 +02:00
Laurent Destailleur
a3d0835c37 Fix param 2020-09-20 16:11:02 +02:00
Laurent Destailleur
667fb1098c Fix 2020-09-20 16:06:53 +02:00
Laurent Destailleur
1a494542c6 Fix static 2020-09-20 14:40:49 +02:00
Laurent Destailleur
3f2220bd6f Fix 2020-09-20 14:34:19 +02:00
daraelmin
b3d386fa54
Fix Category is lost on sorting member list 
When sorting member list filter by tag/category the criteria is lost because of one missing GET parameter

Just adding a GET parameter to keep the category/tag parameter when sorting the list
 2020-09-20 08:42:25 +02:00
Laurent Destailleur
2eb46b4900 Enhance antiXSS by excluding non printable chars used to obfuscate hack 2020-09-20 04:56:45 +02:00
Laurent Destailleur
85aa1ab402 Fix sanitizing 2020-09-20 03:37:05 +02:00
Laurent Destailleur
233aa58161 Fix sanitizing 2020-09-20 03:36:02 +02:00
Laurent Destailleur
e5cca13ea0 Fix escaping 2020-09-20 03:32:43 +02:00
Laurent Destailleur
0e4d3c19dd Fix escaping 2020-09-20 02:57:15 +02:00
Laurent Destailleur
f57b4fd2fd Fix escaping 2020-09-20 02:30:53 +02:00
Laurent Destailleur
fa86b62198 Fix escaping 2020-09-20 01:53:24 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Laurent Destailleur
c191dd1a34 Fix escaping 2020-09-19 23:27:11 +02:00
Laurent Destailleur
2c660504bb Fix escape 2020-09-19 23:11:38 +02:00
Laurent Destailleur
d38168f49e Fix escape 2020-09-19 22:59:04 +02:00
Laurent Destailleur
b5703350da Fix escape 2020-09-19 22:41:05 +02:00
Cédric
a0313fdc52
Update api_invoices.class.php 2020-09-19 22:39:39 +02:00
Cédric
68ccbac49c
Update api_orders.class.php 2020-09-19 22:35:33 +02:00
stickler-ci
3deed42671 Fixing style errors. 2020-09-19 20:05:08 +00:00
Cédric
7306a949e3
Update api_invoices.class.php 2020-09-19 22:02:52 +02:00
Cédric
90d2dfcca7
FIX deleteContact 2020-09-19 22:01:48 +02:00
Laurent Destailleur
54c0f742b1 Fix escape 2020-09-19 21:19:04 +02:00
Laurent Destailleur
7dd69a2b2b Fix escape 2020-09-19 20:11:04 +02:00
Laurent Destailleur
14aa9c01da Neutral message if login / email exists #yohosha4542 2020-09-19 18:40:00 +02:00
Laurent Destailleur
673e1fe5aa Fix #yogosha4539 2020-09-19 18:01:06 +02:00
andreubisquerra
55a0e5f2e7
Avoid errors when Weighing Scale from the cloud in TakePOS 2020-09-19 17:12:41 +02:00
Laurent Destailleur
c6e66d1651 Fixes 2020-09-19 16:05:55 +02:00
Laurent Destailleur
7c50cc9c72 css 2020-09-19 15:17:50 +02:00
Laurent Destailleur
3bd94d52a1 Fix css 2020-09-19 15:15:49 +02:00
Cédric
fbc8fe1e0c
Update api_invoices.class.php 2020-09-19 15:14:29 +02:00
Cédric
a0efd47cce
Update api_invoices.class.php 2020-09-19 15:12:57 +02:00
Cédric
9f22882417
Update api_invoices.class.php 2020-09-19 15:05:28 +02:00
stickler-ci
e1751d4bfb Fixing style errors. 2020-09-19 12:23:53 +00:00
Cédric
720a113125
Update api_invoices.class.php 2020-09-19 14:16:17 +02:00
bahfir abbes
09f23c1d84 fix:remove deleted user params 2020-09-19 13:14:46 +01:00
Laurent Destailleur
0355dc03d8 More secured constantonoff.php 2020-09-19 13:04:23 +02:00
Laurent Destailleur
b1985950a6 Use POST to make the ajax set/del constant 2020-09-19 12:50:47 +02:00
Laurent Destailleur
46eb78cd41 Fix escape 2020-09-19 04:18:51 +02:00
Laurent Destailleur
e142b42f19 Clean code 2020-09-19 04:14:49 +02:00
Alexandre SPANGARO
f8065eb4ed Merge branch '10.0' into 10.0p46 2020-09-19 03:43:33 +02:00
Laurent Destailleur
4a5ee7f04d Better testSqlAndScriptInject (deal htmlentities encoded signatures) 
More phpunits on GETPOST
 2020-09-19 03:25:25 +02:00
Laurent Destailleur
eb36c3f144 Fix must use GETPOST 2020-09-19 02:27:32 +02:00
Laurent Destailleur
93b7956156 Fix sanitizing of backtopage 2020-09-19 02:12:08 +02:00
Laurent Destailleur
a0b230fa46 Fix #yogosha4534 2020-09-19 01:58:46 +02:00
Laurent Destailleur
6a45545ec1 Prepare for fix 2020-09-19 01:53:22 +02:00
Laurent Destailleur
b7a97b2c81 Prepare for fix 2020-09-19 01:45:40 +02:00
Laurent Destailleur
99c05f0923 Fix rss 2020-09-19 00:51:09 +02:00
Laurent Destailleur
f62d52f89a Fix tooltip for linkto object. 
Fix security of ajax selectobject.php
 2020-09-19 00:44:47 +02:00
Laurent Destailleur
63bc3aa48a Better sanitizing 2020-09-19 00:05:29 +02:00
Laurent Destailleur
6d2d5d7cae Fix #yogosha4529 2020-09-19 00:02:38 +02:00
Laurent Destailleur
d21c2f0d61 Better sanitizing 2020-09-18 23:38:45 +02:00
Laurent Destailleur
4f2d3176f5 Fix #yogosha4533 2020-09-18 23:26:05 +02:00
Laurent Destailleur
4710fedda6 Try another fix for #yogosha4514 2020-09-18 23:06:08 +02:00
Bernard Saulme
d86f541b35
FIX|members substitution variable not substituted if empty 
Members substitution variables not substituted if empty for the __MEMBER_ ... variables, the variable is showed instead.
Change to display '' instead
 2020-09-18 18:29:52 +02:00
stickler-ci
f9b4a0f68b Fixing style errors. 2020-09-18 15:54:37 +00:00
ptibogxiv
206b1189c9
NEW fetch contact by email with REST API 2020-09-18 17:52:48 +02:00
Laurent Destailleur
11bf662c38 Fix regression 2020-09-18 17:49:51 +02:00
Laurent Destailleur
b6c6473cce Fix sql injection when forging requests with IN 2020-09-18 17:47:40 +02:00
Laurent Destailleur
4e2aff2cdc Fix sql injection when forging requests with IN 2020-09-18 17:28:02 +02:00
Laurent Destailleur
2d38644ae1 Sanitize sortfield 2020-09-18 17:13:01 +02:00
Laurent Destailleur
d75e1e5771 Fix #yogosha4525 2020-09-18 16:10:11 +02:00
Laurent Destailleur
72d5850a5f Fix regression 2020-09-18 15:45:26 +02:00
Laurent Destailleur
4decf20aaa Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-18 14:56:38 +02:00
Laurent Destailleur
5d3168c2a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-09-18 14:55:58 +02:00
Laurent Destailleur
37c9afebd9 Fix regression 2020-09-18 14:55:32 +02:00
Laurent Destailleur
cf8e8ee68b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/document.php
 2020-09-18 14:54:20 +02:00
Laurent Destailleur
f09aea90df Fix bad test 2020-09-18 14:51:04 +02:00
stickler-ci
b41bfd502a Fixing style errors. 2020-09-18 12:50:53 +00:00
Laurent Destailleur
56a9f5c48b Fix 2020-09-18 14:49:20 +02:00
ptibogxiv
1c65fa0c5d
NEW create thirdparty customer from TAKEPOS 
avoid to switch to backend dolibarr then return to takepos (not really ergonomic and userfriendly)
 2020-09-18 14:48:47 +02:00
Laurent Destailleur
0b2aa2b01d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2020-09-18 14:48:40 +02:00
Laurent Destailleur
07556e061d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contact/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/document.php
 2020-09-18 14:46:23 +02:00
Laurent Destailleur
4e56115d2d Fix No CSRF for install module using GET 2020-09-18 14:35:30 +02:00
Laurent Destailleur
2fe9514b6b Doc 2020-09-18 14:01:00 +02:00
Laurent Destailleur
9134892c71 Fix remove useless code 2020-09-18 13:58:09 +02:00
Laurent Destailleur
cc5d648888 Enhance the anti injection layer 2020-09-18 13:41:50 +02:00
Laurent Destailleur
cddec2f4dc Fix XSS 2020-09-18 13:25:56 +02:00
stickler-ci
ccb570d87d Fixing style errors. 2020-09-18 10:23:47 +00:00
Tobias Sekan
b2a953ed5b
Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-18 12:21:41 +02:00
Sekan, Tobias
eac9e54e0b fix more different button visibility 2020-09-18 11:48:53 +02:00
Sekan, Tobias
ae8c302c19 merge variable declaration 2020-09-18 10:52:17 +02:00
Sekan, Tobias
dc4250aed7 Make button visiblity identical on most lists 2020-09-18 10:46:23 +02:00
Sekan, Tobias
1b04ef8aad Add function to all list that support $socid 2020-09-18 10:36:40 +02:00
Sekan, Tobias
b879b365c3 bette code style 2020-09-18 08:30:28 +02:00
Sekan, Tobias
c82992714b Fix wrong visibility of commercial mein menu 2020-09-18 08:00:43 +02:00
Sekan, Tobias
d1f70a37df Preselect thirparty on new from list (part 1) 2020-09-18 07:56:13 +02:00
Laurent Destailleur
1ad6461ade Fix #yogosha4500 2020-09-18 06:10:41 +02:00
Laurent Destailleur
a7a8ca0a6b Fix phpcs 2020-09-18 06:03:59 +02:00
Laurent Destailleur
b35db6b9dd Clean code managing canvas 2020-09-18 06:02:52 +02:00
Laurent Destailleur
b49211b278 Phpcs 2020-09-18 05:37:20 +02:00
Laurent Destailleur
234b9f1f57 Fix CSRF 2020-09-18 05:07:58 +02:00
Laurent Destailleur
aa3f906370 Standardize code 2020-09-18 04:53:43 +02:00
Laurent Destailleur
534846c5c7 NEW Framework is ready for CSRF token protection on explicit GET URLs. 2020-09-18 04:30:24 +02:00
Laurent Destailleur
8d77bfacd2 Fix #yogosha4490 2020-09-18 03:07:13 +02:00
Laurent Destailleur
c94b3f6584 Fix transversal URL #yogosha4513 2020-09-18 01:57:23 +02:00
Laurent Destailleur
801712b423 Fix phpcs 2020-09-18 01:41:42 +02:00
Alexandre SPANGARO
19c0738b14 Merge branch '10.0' into 10.0p46 2020-09-18 01:41:25 +02:00
Laurent Destailleur
11b1e0b420 Escape output 2020-09-18 01:39:32 +02:00
Alexandre SPANGARO
f453e43cca FIX Yogosha report 4425 (backport) 2020-09-18 01:37:15 +02:00
Laurent Destailleur
7704375ccd Fix GETPOST 2020-09-18 01:36:06 +02:00
Laurent Destailleur
dc22f3ca19 Fix phpcs 2020-09-18 01:30:36 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Alexandre SPANGARO
142a27d472 Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0 2020-09-18 01:22:21 +02:00
Laurent Destailleur
27d03a2034 Better support of SFTP for the FTP module 2020-09-18 00:36:24 +02:00
Laurent Destailleur
57ff4784b1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-17 23:17:33 +02:00
Laurent Destailleur
13646ff41e Fix #yogosha4516 2020-09-17 23:16:48 +02:00
Laurent Destailleur
f55ad8a51c
Merge pull request #14767 from Tim-Otte/fix-missing-hash-in-html-to-odt-converter 
FIX: HTML to ODT converter
 2020-09-17 23:07:10 +02:00
Laurent Destailleur
937d656f46 Fix #yogosha4515 2020-09-17 23:02:09 +02:00
Laurent Destailleur
7056c19cd2 css 2020-09-17 22:35:05 +02:00
Laurent Destailleur
9eaf2be9ab Prepare code for fix 2020-09-17 22:26:54 +02:00
Laurent Destailleur
9f0ca6f6fc Add file 2020-09-17 22:12:59 +02:00
ptibogxiv
08d7973b4a
Update list.php 2020-09-17 22:10:22 +02:00
Laurent Destailleur
5744b1e0a3 Fix #yogosha4512 2020-09-17 21:34:31 +02:00
Laurent Destailleur
a895cdcdf8 Fix dol_string_nohtmltag: the decode of entity must be done before split 2020-09-17 21:09:16 +02:00
Laurent Destailleur
f5908c29da Fix regression in website module to get javascript files 2020-09-17 20:55:20 +02:00
Laurent Destailleur
0f0e4feeaf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modSociete.class.php
 2020-09-17 19:33:29 +02:00
Laurent Destailleur
caaf0d370a Fix #yogosha4474 2020-09-17 19:01:01 +02:00
Laurent Destailleur
28fad93fb7 Typo 2020-09-17 17:30:44 +02:00
Got2be
03f37f3c1f NEW : add hooks on stats pages 2020-09-17 17:00:58 +02:00
Laurent Destailleur
eae5410ced Protect md file 2020-09-17 16:57:39 +02:00
ptibogxiv
cbd511fbb4
Update list.php 2020-09-17 16:16:35 +02:00
Laurent Destailleur
d04d1d1499 Use note_private instead of note 2020-09-17 16:13:57 +02:00
Laurent Destailleur
d73642559c Fix 2020-09-17 15:31:16 +02:00
Laurent Destailleur
5a22a07637 css 2020-09-17 15:30:20 +02:00
Laurent Destailleur
dbf8ed2fec Fix output 2020-09-17 15:29:13 +02:00
Laurent Destailleur
6bcc1d65eb Always hide hash 2020-09-17 15:28:16 +02:00
Laurent Destailleur
f575c503f1 Fix css 2020-09-17 15:21:59 +02:00
Laurent Destailleur
e123a4cb84 Fix help on minimum nb of chars 2020-09-17 15:09:29 +02:00
Laurent Destailleur
7cc75ac873 Fix: removing also " when removing " from a received parameter. 2020-09-17 14:43:58 +02:00
Laurent Destailleur
9a758b7edd FIX #yogosha4483 2020-09-17 14:31:25 +02:00
Laurent Destailleur
31a68cfc18 FIX #yogosha4483 2020-09-17 14:30:10 +02:00
Laurent Destailleur
16b9e62866 FIX #yogosha4456 2020-09-17 14:20:37 +02:00
Tim Otte
f5c0cd25e2 Fixed html to odt converter 2020-09-17 13:19:31 +02:00
Laurent Destailleur
8029b80f08 Fix install hangs 2020-09-17 13:03:34 +02:00
Laurent Destailleur
2f100fdf79 Fix alpha into alphanohtml 2020-09-17 12:53:58 +02:00
Cédric
75b46dd535
Update api_products.class.php 2020-09-17 12:45:20 +02:00
Cédric
2b6a6e12e3
Update api_products.class.php 2020-09-17 12:43:04 +02:00
Cédric
0d20b6645d
Update ProductCombination.class.php 2020-09-17 12:37:20 +02:00
Cédric
67b565df6b
Update card.php 2020-09-17 12:34:47 +02:00
Cédric
e711ab3aa3
Update product.lib.php 2020-09-17 12:31:56 +02:00
Laurent Destailleur
0bf0312d50 FIX #yogosha4448 2020-09-17 12:30:14 +02:00
Laurent Destailleur
33cefacf91 Fix missing global 2020-09-17 12:17:14 +02:00
ptibogxiv
8284d0ee06
FIx product list 
fix mistake if fk_state empty
 2020-09-17 11:41:53 +02:00
Laurent Destailleur
05636c39bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-17 11:39:58 +02:00
Laurent Destailleur
939433706b FIX #yogosha4465 2020-09-17 11:37:41 +02:00
Laurent Destailleur
5daba4b0ed
Merge pull request #14752 from ptibogxiv/patch-360 
NEW filter product list by country and/or state/province
 2020-09-17 11:21:23 +02:00
Laurent Destailleur
5e3f6ce736
Merge pull request #14749 from TobiasSekan/UseNewTableFunctionAndCleanup 
Use new table function for comm/propal + cleanup
 2020-09-17 11:20:31 +02:00
Laurent Destailleur
5d8b9056b4
Merge pull request #14755 from atm-lena/10.0_FIX_SendMailFromAContact 
FIX - Send mail from contact : select mail model
 2020-09-17 11:15:58 +02:00
Laurent Destailleur
d92e482841 FIX #yogosha transversal path when unzipping file 2020-09-17 11:09:43 +02:00
Laurent Destailleur
004ba33695 Fix cach call of useNPR() 2020-09-17 10:11:06 +02:00
Alexandre SPANGARO
55e3f8365e FIX Yogosha report 4434 (backport) 2020-09-16 21:36:55 +02:00
Alexandre SPANGARO
6928b6543c Revert "FIX Yogosha report 4425 (backport)" 
This reverts commit 23c4cfe913.
 2020-09-16 21:24:24 +02:00
Alexandre SPANGARO
bc457ebb66 Stickler 2020-09-16 21:22:59 +02:00
Alexandre SPANGARO
23c4cfe913 FIX Yogosha report 4425 (backport) 2020-09-16 20:55:28 +02:00
Laurent Destailleur
4630887591 Fix css 2020-09-16 20:09:40 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
47031cb656 Fix phpcs 2020-09-16 18:51:19 +02:00
Laurent Destailleur
295c2b1d17 FIX #yogosha4435 2020-09-16 17:56:26 +02:00
Laurent Destailleur
7b8a206730 FIX #yogosha 2020-09-16 17:48:59 +02:00
atm-lena
3182537566 FIX - Send mail from contact : select mail model 2020-09-16 17:19:25 +02:00
Laurent Destailleur
1fd633ed21 FIX #yogosha4433 2020-09-16 16:34:19 +02:00
Laurent Destailleur
dec73da206 FIX #yogosha4430 2020-09-16 16:17:02 +02:00
Laurent Destailleur
d0c02f3714 FIX #yogosha4426 2020-09-16 14:51:46 +02:00
Laurent Destailleur
d7aa376c3c FIX Yogosha report 4425 2020-09-16 14:37:05 +02:00
Sekan, Tobias
91641e593f MAIN_DASHBOARD_USE_TOTAL_HT + more clean 2020-09-16 14:03:41 +02:00
Laurent Destailleur
09558d0ce9 Fix MAIN_OPTIMIZEFORTEXTBROWSER 2020-09-16 13:15:57 +02:00
ptibogxiv
6f564c1937
NEW filter product list by country and/or state/province 2020-09-16 12:34:07 +02:00
Laurent Destailleur
40acd8a386 Fix missing field canvas 2020-09-16 12:17:33 +02:00
stickler-ci
be27617e68 Fixing style errors. 2020-09-16 09:11:01 +00:00
Sekan, Tobias
ac1fdb4a59 Use new table function for comm/propal + cleanup 2020-09-16 10:51:19 +02:00
andreubisquerra
ffb1b5c2ca
Fix travis 2020-09-16 07:59:36 +02:00
andreubisquerra
9bb41e949d
Fix travis 2020-09-16 07:39:48 +02:00
jove@bisquerra.com
31eecae2a6 Show buttons on products when 'Hide Product Images' is enabled 2020-09-16 06:54:01 +02:00
Laurent Destailleur
382a4552eb Fix css 2020-09-16 03:39:03 +02:00
Laurent Destailleur
a3492dfb5b Clean code 2020-09-16 03:15:31 +02:00
Laurent Destailleur
adeed1464d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-16 02:56:09 +02:00
Laurent Destailleur
baa46cd502 Fix syntax error 2020-09-16 02:53:44 +02:00
Laurent Destailleur
ffa91451eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-16 02:50:36 +02:00
Laurent Destailleur
e5191cad24 Move code of incoterm into the Incoterm Trait. 2020-09-16 02:50:18 +02:00
Laurent Destailleur
4224e5da41
Merge pull request #14729 from bafbes/abb120143 
allow access to adherent_extrafields table fields in printFieldListWhere hook
 2020-09-16 01:14:01 +02:00
Laurent Destailleur
06a73539fe
Merge pull request #14731 from ATM-Consulting/12.0_FIX_round_virtual_stock_value_on_reassort_list 
FIX 12.0 - round value of virtual stock on product stock reassort list
 2020-09-16 01:12:34 +02:00
Laurent Destailleur
2da4838141
Merge pull request #14730 from ptibogxiv/patch-358 
NEW get state dictionnary by REST API
 2020-09-16 01:12:08 +02:00
Laurent Destailleur
584a02bc9a
Update api_setup.class.php 2020-09-16 01:11:47 +02:00
Laurent Destailleur
b7d56cbfbf Fix syntax error 2020-09-16 01:09:54 +02:00
Laurent Destailleur
ed8b4100c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-16 01:07:08 +02:00
Laurent Destailleur
b690bab1a8 Fix regression: missing column 2020-09-16 01:06:54 +02:00
Laurent Destailleur
d954de2d35
Merge pull request #14732 from ptibogxiv/patch-359 
NEW add State/Province origin for products
 2020-09-16 01:02:00 +02:00
stickler-ci
b3f78100bf Fixing style errors. 2020-09-15 23:01:00 +00:00
Laurent Destailleur
9e494d0bb3
Update card.php 2020-09-16 00:59:23 +02:00
Laurent Destailleur
52c9e7230f
Merge pull request #14734 from inoveaconseil/NEW_Scope_Oauth_Google 
New scope oauth google
 2020-09-16 00:55:10 +02:00
Laurent Destailleur
b5cac258bf
Merge pull request #14739 from defrance/patch-155 
Users can now have non-binary gender
 2020-09-16 00:54:07 +02:00
Laurent Destailleur
81d71589d9
Merge pull request #14743 from cfoellmann/minor-fix-bydates 
fix for broken table on dispatch when hiding sellby/eatby dates
 2020-09-16 00:53:03 +02:00
Laurent Destailleur
c152f8d76f
Merge branch 'develop' into patch-4 2020-09-16 00:52:16 +02:00
Laurent Destailleur
6a0c924fa8
Merge pull request #14738 from aspangaro/13a18 
Debugbar - Move to Font Awesome 5 Free
 2020-09-16 00:50:36 +02:00
Laurent Destailleur
7e941ff5ac
Merge pull request #14747 from daraelmin/develop 
FIX #14746 Historical list of subscription shows empty member type
 2020-09-16 00:49:41 +02:00
Laurent Destailleur
5c31593d43 Add date of birth in candidatures 2020-09-16 00:47:44 +02:00
daraelmin
8b928a110e
FIX #14746 
Historical list of subscription shows empty member type if not recorded
 2020-09-15 22:23:22 +02:00
Alexandre SPANGARO
e0c3977728 Debugbar - Move to Font Awesome 5 Free 2020-09-15 22:21:00 +02:00
Alexandre SPANGARO
c474484262 Revert "Debugbar - Move to Font Awesome 5 Free" 
This reverts commit 1b5873af1f.
 2020-09-15 22:10:24 +02:00
Frédéric FRANCE
070f9a0c89
uniformise scan_dir to scandir in admin supplier payments 2020-09-15 16:32:32 +02:00
Laurent Destailleur
7bcf2c9089 css 2020-09-15 14:45:51 +02:00
Christian Foellmann
c869f8fe5f fix for broken table on dispatch when hiding sellby/eatby dates 2020-09-15 14:19:02 +02:00
Laurent Destailleur
51963f4c2a css 2020-09-15 13:48:48 +02:00
Laurent Destailleur
afc6155783 FIX sign of amount with credit note and multicurrencies 2020-09-15 13:30:59 +02:00
Laurent Destailleur
cc24e9b155 Look and feel v13 2020-09-15 13:27:48 +02:00
Laurent Destailleur
5ca8141cd8 Typo 2020-09-15 12:09:48 +02:00
Laurent Destailleur
9a9b7ecb95 CSS 2020-09-15 12:07:15 +02:00
BENKE Charlene
1d0dc7cab0
Update list.php 2020-09-15 11:31:29 +02:00
BENKE Charlene
b01a68abef
Update card.php 2020-09-15 11:30:47 +02:00
Laurent Destailleur
522676d745
Merge pull request #14737 from aspangaro/13a17 
Time to enable fontawesome icons on weather feature
 2020-09-15 11:29:28 +02:00
Laurent Destailleur
3fd041e861
Update functions.lib.php 2020-09-15 11:28:49 +02:00
Laurent Destailleur
3dfa9acbef CSS 2020-09-15 11:18:57 +02:00
Laurent Destailleur
7a28972c8a FIX sign of amount of invoice lines for credit note with multicurrency 
FIX Add INVOICE_POSITIVE_CREDIT_NOTE_SCREEN to solve PT requirement
 2020-09-15 11:18:21 +02:00
BENKE Charlene
0aa97a8b02
Update main.lang 2020-09-15 10:59:07 +02:00
BENKE Charlene
be704ef5e8
Update list.php 2020-09-15 10:57:48 +02:00
BENKE Charlene
0765fff355
Update card.php 2020-09-15 10:51:09 +02:00
Laurent Destailleur
cb5afc1842 CSS 2020-09-15 10:18:54 +02:00
Alexandre SPANGARO
1b5873af1f Debugbar - Move to Font Awesome 5 Free 2020-09-15 04:05:26 +02:00
Alexandre SPANGARO
4137e92430 Time to enable fontawesome icons on weather feature 2020-09-15 03:42:35 +02:00
Alexandre SPANGARO
a8c1b835db Fix display on quickadd dropdown menu 2020-09-15 03:08:06 +02:00
Laurent Destailleur
b7b1de4580 Fix position of GPAO must be after Product. 
CSS
 2020-09-15 02:41:08 +02:00
Laurent Destailleur
bd577e253a Fix phpcs 2020-09-14 22:31:57 +02:00
Laurent Destailleur
6dd1f522eb CSS 2020-09-14 22:30:22 +02:00
Laurent Destailleur
7712b277a6 Look and feel v13 2020-09-14 21:55:25 +02:00
Laurent Destailleur
cf423add2e Reminders visible on edit page too 2020-09-14 21:09:48 +02:00
Laurent Destailleur
59c10235b5 Show reminders on the event page 2020-09-14 21:06:40 +02:00
Laurent Destailleur
f626bd70d0 Look and feel v13 2020-09-14 20:53:42 +02:00
Laurent Destailleur
7cbc621f6b css 2020-09-14 19:00:18 +02:00
Laurent Destailleur
cc37f4b29c Clean code. <input name="token" value="$_SESSION['newtoken']" is now 
forbidden by CI. You must use newToken().
 2020-09-14 16:24:02 +02:00
Florian Mortgat
06d31e8b9a FIX: missing entity check 2020-09-14 16:09:45 +02:00
stickler-ci
b39b9e4227 Fixing style errors. 2020-09-14 13:19:26 +00:00
Nicolas
ee4e209e7c NEW Oauth SCOPE for Admin SDK 2020-09-14 15:12:57 +02:00
Laurent Destailleur
8afd448def Add warning if a hidden option is on to encourage to remove it. 2020-09-14 15:05:35 +02:00
Laurent Destailleur
f6555a9077 Look and feel v12 2020-09-14 14:46:38 +02:00
Laurent Destailleur
550cec06a4 Look and feel v12 2020-09-14 14:41:11 +02:00
Laurent Destailleur
33d61333b1 Fix picto 2020-09-14 12:50:07 +02:00
Laurent Destailleur
604a807ac0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-14 12:48:00 +02:00
Laurent Destailleur
6117e0d8d7 Fix tooltip into tooltip 2020-09-14 12:47:43 +02:00
stickler-ci
ad84aaacc6 Fixing style errors. 2020-09-14 09:01:11 +00:00
ptibogxiv
92aab677e9
Update product.class.php 2020-09-14 10:59:09 +02:00
ptibogxiv
de31920f28
NEW add state origin for product 
usefull for food, fruits or vegetables  or regional product

soon in other PR i will push filter by state or country in product list
 2020-09-14 10:57:51 +02:00
ptibogxiv
f09655ec6c
Update api_setup.class.php 2020-09-14 10:53:38 +02:00
Florian Mortgat
4c6b0ed5b5 FIX 12.0 - round value of virtual stock on product stock reassort list 2020-09-14 10:49:44 +02:00
stickler-ci
75a9678086 Fixing style errors. 2020-09-14 08:48:04 +00:00
ptibogxiv
e98ae029e3
Update cstate.class.php 2020-09-14 10:46:19 +02:00
ptibogxiv
557a6863ba
NEW get state by REST API 2020-09-14 10:45:20 +02:00
kkhelifa-opendsi
1f5f784b75
Merge branch 'develop' into email_smtp_allow_auto_signed 2020-09-14 10:25:15 +02:00
kamel
2a5b31da2d CORE smtps: Corrections 2020-09-14 10:22:05 +02:00
stickler-ci
3de5e0f957 Fixing style errors. 2020-09-14 02:30:37 +00:00
Scrutinizer Auto-Fixer
73915d51c8 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-14 02:30:04 +00:00
Laurent Destailleur
22edd650d3 Fix phpcs 2020-09-14 04:24:35 +02:00
Laurent Destailleur
c0ef7e8f13 fix phpcs 2020-09-14 04:23:14 +02:00
Laurent Destailleur
814f07d316 Missing picto property 2020-09-14 04:11:12 +02:00
Laurent Destailleur
b20be7074e phpcs 2020-09-14 04:08:11 +02:00
Laurent Destailleur
7ca9fd9dce Fix merge 2020-09-14 03:49:31 +02:00
Laurent Destailleur
dd06ff3a0d Label 2020-09-14 03:41:18 +02:00
Laurent Destailleur
419ac91a7a FIX #14538 2020-09-14 03:34:03 +02:00
Laurent Destailleur
78a999e6f3 css 2020-09-14 02:57:43 +02:00
Laurent Destailleur
bd8185fb49 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-14 02:49:35 +02:00
Laurent Destailleur
59bc8ee07c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/stats/byproperties.php
	htdocs/adherents/stats/geo.php
	htdocs/admin/system/dolibarr.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/admin.lang
	htdocs/product/class/product.class.php
 2020-09-14 02:49:19 +02:00
Laurent Destailleur
701b83db38 FIX Bad number of subscription (forgotten when member was resiliated) 2020-09-14 02:38:12 +02:00
Laurent Destailleur
b2288ad2d9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-14 02:33:00 +02:00
Laurent Destailleur
a891211f78 Fix bad link 2020-09-14 02:32:30 +02:00
Laurent Destailleur
c40ec37b60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-14 02:13:43 +02:00
Laurent Destailleur
c3ba8f7843 Better translation 2020-09-14 02:13:27 +02:00
Laurent Destailleur
3cb77d2e75
Merge pull request #14704 from aspangaro/13a12 
New Accountancy - Add default account for customer deposit
 2020-09-14 01:13:17 +02:00
Laurent Destailleur
dad02afa22
Update accountancy.lang 2020-09-14 01:13:07 +02:00
Laurent Destailleur
970995d728 Clean code. Replace num_paiement with num_payment everywhere. 2020-09-14 01:03:51 +02:00
Laurent Destailleur
a2df666d34 Standardize code 2020-09-14 00:41:31 +02:00
Laurent Destailleur
62b7a90ea3
Merge pull request #14723 from c3do/patch-13 
NEW API Can update a payment
 2020-09-14 00:29:10 +02:00
Laurent Destailleur
e9d0869383
Update api_invoices.class.php 2020-09-14 00:28:43 +02:00
Laurent Destailleur
dcdce246b1
Update api_invoices.class.php 2020-09-14 00:26:16 +02:00
Laurent Destailleur
cdf071ea10
Merge pull request #14717 from bafbes/abb120142 
allow external users to see thirdparties with printFieldListWhere hook.
 2020-09-14 00:23:26 +02:00
Laurent Destailleur
26b4fb3e68
Update list.php 2020-09-14 00:22:58 +02:00
Laurent Destailleur
1015d3c026
Merge pull request #14716 from 99Deon/develop 
fix bug  in "llx_c_ticket_category.sql"  table .
 2020-09-14 00:17:16 +02:00
Laurent Destailleur
18b20a5587
Merge pull request #14721 from indelog/12.0 
Fix: getLabelOfUnit() for Product, CommonObjectline to print long label
 2020-09-14 00:16:38 +02:00
Laurent Destailleur
d0698735d6
Update product.class.php 2020-09-14 00:14:25 +02:00
Laurent Destailleur
0d9d9498e2
Update commonobjectline.class.php 2020-09-14 00:13:12 +02:00
Laurent Destailleur
7b13730a84
Merge pull request #14718 from c3do/patch-12 
NEW ref_ext for llx_paiement
 2020-09-14 00:07:39 +02:00
Laurent Destailleur
e941212ab9
Merge pull request #14725 from andreubisquerra/master 
NEW Weighing Scale compatibility with TakePOS
 2020-09-14 00:05:56 +02:00
Laurent Destailleur
a4fb16b4f3 Add a warning to warn about security leak 2020-09-14 00:03:49 +02:00
Alexandre SPANGARO
2ae91b131f Fix display on quickadd dropdown menu 2020-09-13 22:17:24 +02:00
bahfir abbes
c5fa6eac58 allow access to adherent_extrafields table fields in printFieldListWhere hook; 2020-09-13 21:02:04 +01:00
jove@bisquerra.com
e55c16c039 NEW Weighing Scale compatibility with TakePOS connector 2020-09-13 21:12:14 +02:00
Laurent Destailleur
3585d3d52f css 2020-09-13 15:21:45 +02:00
stickler-ci
8d3bc3ee6f Fixing style errors. 2020-09-13 13:18:42 +00:00
Cédric
929804f4d2
Update api_invoices.class.php 2020-09-13 15:12:22 +02:00
Laurent Destailleur
f9af7bc114 Fix phpcs 2020-09-13 14:42:56 +02:00
DEMAREST Maxime (Indelog)
1c523abbd8 Fix: getLabelOfUnit() for Product, CommonObjectline to print long label 
Also add $type = 'code' for return unit code in form 'unitXX' (where XX
is the code of unit).

for get return like unitXX where XX is the code of unit
 2020-09-13 07:44:30 +02:00
stickler-ci
2cfe740d85 Fixing style errors. 2020-09-12 17:08:44 +00:00
Cédric
acc995a553
Update commoninvoice.class.php 2020-09-12 19:05:33 +02:00
Cédric
29931bbded
Update 12.0.0-13.0.0.sql 2020-09-12 18:55:26 +02:00
Cédric
1f5419c883
Update llx_paiement.sql 2020-09-12 18:53:02 +02:00
Cédric
d728d268ca
Update paiement.class.php 2020-09-12 18:49:52 +02:00
bahfir abbes
ef0b84a507 allow external users to see thirdparties with printFieldListWhere hook; 2020-09-12 16:40:18 +01:00
chkernit
7252022afe
fix problem in table "llx_c_ticket_category.sql" 
when install dolibarr project  the step of creation tables does not completed because there are a bug in create llx_c_ticket_category.sql table .
 2020-09-12 16:33:07 +01:00
Laurent Destailleur
48e34c2069 Add int 2020-09-12 15:53:18 +02:00
Laurent Destailleur
7d25de5713 Enhance setup page for email setup 2020-09-12 15:39:14 +02:00
Laurent Destailleur
1f8278c8ca Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/core/class/html.formmail.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/other.lang
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-09-12 04:42:59 +02:00
Laurent Destailleur
5ea3f09e17 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/translate.class.php
 2020-09-12 04:29:28 +02:00
Laurent Destailleur
709542e27d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-09-12 04:26:00 +02:00
Laurent Destailleur
990af9d5cf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
 2020-09-12 04:25:54 +02:00
Laurent Destailleur
4b525f6826 Debug notifications on browser 2020-09-12 04:12:39 +02:00
Laurent Destailleur
2ffe84b5f5 Debug notifications on browser 2020-09-12 04:08:05 +02:00
Laurent Destailleur
9dad8f0fb7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-12 03:02:27 +02:00
Laurent Destailleur
f45054df06 Close #14604 Merge manually change to get notification to show 
Remains: support call of the action=closereminderid done by browser once
notif has be thrown.
 2020-09-12 03:02:08 +02:00
Laurent Destailleur
ae857e7008
Merge pull request #14673 from atm-john/11.0_fix_loadlang_cron 
FIX Cron load lang
 2020-09-12 01:32:17 +02:00
Laurent Destailleur
ce2de0187d
Merge pull request #14711 from OPEN-DSI/new-emailcollector-ticket-classification-create 
NEW ticket classification on create from email collector
 2020-09-12 01:31:27 +02:00
Laurent Destailleur
5ea37a534c
Merge pull request #14710 from TobiasSekan/cleanup-workflow-module-page-+-bugfixes 
FIX Fix missing translation and missing gap in workflow setup page (+ cleanup)
 2020-09-12 01:26:34 +02:00
Laurent Destailleur
fab3a774d2
Merge pull request #14636 from TobiasSekan/AddTableHelperMethod 
NEW Add helper function for table headers with numbers
 2020-09-12 01:21:24 +02:00
Laurent Destailleur
1bdd4cae9b
Merge pull request #14699 from atm-adrien/NEW_add_widget_empty_tasks 
New add widget empty tasks
 2020-09-12 01:18:50 +02:00
Laurent Destailleur
ec13d3811e
Merge pull request #14706 from aspangaro/12.0p9 
FIX - Accountancy balance Error SQL on entity
 2020-09-12 01:17:04 +02:00
Laurent Destailleur
d44952011f
Update balance.php 2020-09-12 01:16:02 +02:00
Laurent Destailleur
c633e9dc6f
Merge pull request #14702 from ptibogxiv/patch-357 
FIX API variable error code return
 2020-09-12 01:14:28 +02:00
Laurent Destailleur
0bdd1c0c17
Merge pull request #14701 from ATM-Nicolas/fix_wrong_redirection 
FIX : Wrong redirection
 2020-09-12 01:13:46 +02:00
Laurent Destailleur
5c776ccf3f
Merge pull request #14708 from TobiasSekan/AddGlobalMiscPaymentSearch 
NEW Add global search for miscellaneous payments
 2020-09-12 01:13:26 +02:00
Laurent Destailleur
95fb79c749
Merge pull request #14714 from bafbes/abb120141 
fix: unuseful truncations in extrafield select lists
 2020-09-12 01:08:08 +02:00
Laurent Destailleur
ead320642e Fix removed some non used sql requests on widgets 2020-09-12 00:58:06 +02:00
bahfir abbes
e89bfe5ac1 fix: unuseful truncations in extrafield select lists 2020-09-11 22:44:08 +01:00
Laurent Destailleur
009c7eaf31 Standardize code with module builder 2020-09-11 16:16:04 +02:00
lvessiller
5118f1c821 NEW ticket classification on create from email collector 2020-09-11 15:47:46 +02:00
DEMAREST Maxime (Indelog)
e41afeacf4 Fix: short label of unit in Product::getLabelOfUnit 2020-09-11 15:34:11 +02:00
Laurent Destailleur
3930b00e4d Debug a not used page to show agenda per type of event 2020-09-11 14:35:52 +02:00
stickler-ci
97e74642ce Fixing style errors. 2020-09-11 12:26:14 +00:00
Sekan, Tobias
0a0eed289e cleanup workflow page + bugfixes 2020-09-11 14:15:10 +02:00
Laurent Destailleur
58e0dd0d05 Look and feel v13 2020-09-11 14:08:41 +02:00
Laurent Destailleur
c4383747a1 Look and feel v13 2020-09-11 13:57:16 +02:00
Laurent Destailleur
64b28020c8 Look and feel v13 2020-09-11 13:14:14 +02:00
Laurent Destailleur
7e989c8902 Remove TODO: Button Close possible only if production has started. 2020-09-11 12:36:31 +02:00
Laurent Destailleur
753396ec20 Look and feel v13 2020-09-11 12:19:40 +02:00
Laurent Destailleur
7cd437b2d7 CSS 2020-09-11 12:16:54 +02:00
Laurent Destailleur
3b7b7b8ed3 css 2020-09-11 11:58:16 +02:00
Sekan, Tobias
8a6c6c9333 removeempty line 2020-09-11 10:01:25 +02:00
Sekan, Tobias
25d6af2b86 Add global search for misc payments +TODO 2020-09-11 09:55:34 +02:00
Alexandre SPANGARO
8fc9b78b47 FIX Problems on FEC format 2020-09-11 06:55:03 +02:00
Alexandre SPANGARO
04329c38b3 FIX - Accountancy balance Error SQL on entity 2020-09-11 06:42:22 +02:00
Alexandre SPANGARO
5b364fc5fa New Accountancy - Add default account for customer deposit 2020-09-10 21:56:55 +02:00
Laurent Destailleur
05a2fc6186 Fix rate for tunisia 2020-09-10 19:40:03 +02:00
Laurent Destailleur
358f8357f9 FIX #14703 2020-09-10 18:25:38 +02:00
Laurent Destailleur
0d124730a8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/list.php
 2020-09-10 18:05:18 +02:00
Laurent Destailleur
0cccaa7271 FIX look and feel v12 2020-09-10 18:02:49 +02:00
Laurent Destailleur
7e7dec9306 FIX Look and feel v12 2020-09-10 18:02:06 +02:00
Laurent Destailleur
8d93b76258 Clean code 2020-09-10 17:49:05 +02:00
Laurent Destailleur
bd54033975 Look and feel v13 2020-09-10 17:35:18 +02:00
Laurent Destailleur
ed6a16a3c7 FIX look and feel v12 2020-09-10 17:17:31 +02:00
Laurent Destailleur
3eba707e0f Trans 2020-09-10 17:09:32 +02:00
Laurent Destailleur
8c9f2b8458 Fix trans, add log 2020-09-10 17:08:51 +02:00
Laurent Destailleur
f06737097f Look and feel v13 2020-09-10 16:37:42 +02:00
Laurent Destailleur
bcab13c395 Fix typo 2020-09-10 15:52:47 +02:00
Laurent Destailleur
ed3f1c29ef more log 2020-09-10 15:52:09 +02:00
Laurent Destailleur
1da99a8fcd Add log to debug travis error 2020-09-10 15:49:13 +02:00
Laurent Destailleur
753330e499 Fix sort order of import profiles. 2020-09-10 15:43:50 +02:00
ptibogxiv
9f475a3f93
FIX API variable error return 
Some modules, when there is no value, delete the variables so don't find variable can be normal.

Error 404 is better than 500 with error servor (same as other object when not found)
ie thirdparties, contacts invoices...)
 2020-09-10 14:01:00 +02:00
Cédric
3209708e30
Update ProductCombination.class.php 2020-09-10 13:56:58 +02:00
ATM-Nicolas
7944c21fe5 FIX : Wrong redirection 2020-09-10 12:32:12 +02:00
Sekan, Tobias
747d8c32e2 Fix Sticker CI (again :'-( ) 2020-09-10 12:29:01 +02:00
stickler-ci
0fc24366e1 Fixing style errors. 2020-09-10 09:28:05 +00:00
Sekan, Tobias
2292f83258 fix sticker ci 2020-09-10 11:26:17 +02:00
Sekan, Tobias
0cc9cc9bb7 Merge branch 'AddTableHelperMethod' of https://github.com/TobiasSekan/dolibarr into AddTableHelperMethod 2020-09-10 11:25:41 +02:00
Sekan, Tobias
3f8b2153ea fix sticker Ci and add missing doc 2020-09-10 11:25:35 +02:00
Adrien Raze
b4942707bb EN_US Traductions 2020-09-10 11:23:45 +02:00
Adrien Raze
419b2b71a9 FIX : modif requete SQL, prise en compte user connecté pour saisie des temps 2020-09-10 11:16:52 +02:00
Adrien Raze
acfae190c3 FIX : suppression lien nbTâche 2020-09-10 11:15:56 +02:00
Adrien Raze
5a30165947 FIX : correction redirection pour nbTache 2020-09-10 11:15:12 +02:00
Adrien Raze
343b39e31f FIX : lien cliquable tiers 2020-09-10 11:14:27 +02:00
Adrien Raze
281b52db75 lien cliquable nbTache vers liste tache filtrée 2020-09-10 11:13:46 +02:00
Adrien Raze
76d5ce18ca Titres + lien cliquable client + traductions 2020-09-10 11:12:04 +02:00
Adrien Raze
c9833c501d SQL + insertion champs dans box 2020-09-10 11:10:06 +02:00
Adrien Raze
912999a6b6 Creation box 2020-09-10 11:09:49 +02:00
Laurent Destailleur
6a9cadd9d4 Removed warning 2020-09-10 11:09:20 +02:00
stickler-ci
be32a24eed Fixing style errors. 2020-09-10 09:07:10 +00:00
Sekan, Tobias
d2903c5de6 adress feedback + massive cleanup 2020-09-10 11:04:41 +02:00
John Botella
59d5391c2a Add force reload param to load method 2020-09-10 10:41:16 +02:00
Laurent Destailleur
6ec89afe8b Fix phpcs 2020-09-10 03:30:24 +02:00
Laurent Destailleur
b3fe61e77b Start fix for #14689 2020-09-10 03:28:41 +02:00
Laurent Destailleur
f78cbdefe8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-10 01:49:31 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +02:00
Laurent Destailleur
a492cabc13
Merge pull request #14617 from TobiasSekan/ShipmentAreaCountsAndClick 
NEW Show header numbers and make it clickable in shipment area
 2020-09-09 19:40:24 +02:00
Laurent Destailleur
069242e7bc
Update index.php 2020-09-09 19:38:48 +02:00
Laurent Destailleur
efb59754d7
Update 12.0.0-13.0.0.sql 2020-09-09 19:32:14 +02:00
Laurent Destailleur
fb51fe1087 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-09 19:25:36 +02:00
Laurent Destailleur
177ec5eb39 Fix mandatory field 2020-09-09 19:25:16 +02:00
Laurent Destailleur
08ab4855f2
Merge branch 'develop' into 13a11 2020-09-09 19:12:08 +02:00
Romain DESCHAMPS
476cb642f4
Fix ToSell/ToBuy tag in supplier products list 
#14691
 2020-09-09 19:01:45 +02:00
Laurent Destailleur
c761b829b4
Merge pull request #14659 from Tim-Otte/feature-filterable-purchase-price-table-columns 
NEW Purchase price table: Added filterable table columns
 2020-09-09 18:55:55 +02:00
Laurent Destailleur
803efa7acc Add hidden constant until feature is reliable 2020-09-09 15:39:47 +02:00
Laurent Destailleur
3aa921fd0a
Merge pull request #14665 from TobiasSekan/NewCommonFilterForModuleOverview 
NEW Add common list function for available app/module page
 2020-09-09 15:36:46 +02:00
Laurent Destailleur
b7dcd88192
Merge pull request #14667 from TobiasSekan/FixWrongVisibleTaxMenuEntry 
FIX wrong visible of tax menu entry
 2020-09-09 15:34:41 +02:00
Laurent Destailleur
abd1b1b4a9
Merge pull request #14657 from TobiasSekan/AddMissingTranslationsForPermissions 
FIX Add missing translations for permissions
 2020-09-09 15:27:22 +02:00
Laurent Destailleur
e439eb636e
Merge pull request #14660 from FHenry/dev_updatedocker 
Update Docker build to new standard (version 3 of docker-compose)
 2020-09-09 15:26:06 +02:00
Laurent Destailleur
4314f65053
Merge pull request #14669 from TobiasSekan/FixWrongVisiblityOfBankMenuEntry 
FIX wrong visibility of bank menu entry
 2020-09-09 15:20:46 +02:00
Laurent Destailleur
12fba9e679 Fix label 2020-09-09 15:19:12 +02:00
Laurent Destailleur
1c8e02df3b Doc 2020-09-09 15:16:03 +02:00
Laurent Destailleur
e70f27046e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-09 15:15:07 +02:00
Laurent Destailleur
230b6cdfd4 Add method isLoaded($domain) 2020-09-09 15:14:52 +02:00
Laurent Destailleur
c3ac446cf2
Merge pull request #14674 from ATM-Consulting/12.0_FIX_stock_is_not_rounded_on_product_list 
FIX: round stock value on product list
 2020-09-09 14:54:42 +02:00
Laurent Destailleur
97ee96e0dc
Merge pull request #14683 from TobiasSekan/SelectableColumnsOnExtraPayments 
NEW Select-able columns on miscellaneous payments + more data columns
 2020-09-09 14:54:04 +02:00
Laurent Destailleur
80573532e3
Merge pull request #14684 from OPEN-DSI/new-ticket-edit-and-update-action 
NEW edit and update a ticket
 2020-09-09 14:48:47 +02:00
Laurent Destailleur
e418046ce5
Merge pull request #14681 from bafbes/abb120139 
FIX replace values of __YEAR__, __MONTH__ and __DAY__ in member docs
 2020-09-09 14:47:08 +02:00
Laurent Destailleur
b99192bdb2
Update pdf_standard.class.php 2020-09-09 14:46:42 +02:00
stickler-ci
221c54c16f Fixing style errors. 2020-09-09 12:46:25 +00:00
Laurent Destailleur
4b783d203e
Update pdf_standard.class.php 2020-09-09 14:44:09 +02:00
Laurent Destailleur
229aa14a97
Update pdf_standard.class.php 2020-09-09 14:43:24 +02:00
Laurent Destailleur
5c34b26f39 FIX Look and feel v12: First tab must be name of object 2020-09-09 13:57:35 +02:00
Cédric
1d894f4b7c
FIX ref_ext for invoice lines from API 
Add and update ref_ext in invoice lines
 2020-09-09 13:38:42 +02:00
Sekan, Tobias
849a5ed865 Merge branch 'SelectableColumnsOnExtraPayments' of https://github.com/TobiasSekan/dolibarr into SelectableColumnsOnExtraPayments 2020-09-09 13:27:47 +02:00
Sekan, Tobias
8fa001d98d Fix to short summary line 2020-09-09 13:27:41 +02:00
Laurent Destailleur
d236e21639 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2020-09-09 12:51:55 +02:00
Laurent Destailleur
05912b3b55 Fix sql error 2020-09-09 12:50:07 +02:00
lvessiller
0c5bf5012e NEW Ticket title 2020-09-09 12:09:17 +02:00
lvessiller
be2fa82396 FIX stickler error comma in argument list 2020-09-09 11:54:50 +02:00
lvessiller
059624e936 NEW edit and update a ticket 2020-09-09 11:46:56 +02:00
stickler-ci
32d77cc143 Fixing style errors. 2020-09-09 09:46:46 +00:00
Sekan, Tobias
870443a099 Add selectable columns for extra payments 2020-09-09 11:34:47 +02:00
bahfir abbes
f08c91fcc6 fix: replace values of __YEAR__, __MONTH__ and __DAY__ in member docs 2020-09-09 09:29:19 +01:00
Sekan, Tobias
37141b577a fix sticker CI, better names, add missing comapres 2020-09-09 08:34:13 +02:00
Sekan, Tobias
49d009502c fix sticker CI 2020-09-09 08:16:26 +02:00
stickler-ci
ef0078cbb2 Fixing style errors. 2020-09-08 19:29:01 +00:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
Florian Mortgat
4a60725f6c FIX: round stock value on product list 2020-09-08 16:42:41 +02:00
John Botella
87d9dfa009 remove useless comm 2020-09-08 16:17:11 +02:00
John Botella
5a0622c906 FIX cron load lang 2020-09-08 16:14:14 +02:00
ATM-Nicolas
6bd6b285fd FIX : Static property called as non static 2020-09-08 16:03:18 +02:00
Tim Otte
c68928b8d0 Added incoterms to substitution array 2020-09-08 15:53:47 +02:00
lvessiller
23accef5c2 FIX empty value is needed on filter list 2020-09-08 14:53:40 +02:00
kamel
ed13a9fce2 Correction stickler-ci 2020-09-08 14:53:22 +02:00
kamel
ccff18e2a5 NEW : Email configuration - Allow auto signed certificat when ssl activated 2020-09-08 14:48:50 +02:00
Sekan, Tobias
78ac5f03e1 Fix wrong visibility of bank menu entry 2020-09-08 14:44:29 +02:00
Tobias Sekan
f7ea3dba70
Merge branch 'develop' into FixWrongVisibleTaxMenuEntry 2020-09-08 14:19:29 +02:00
Sekan, Tobias
c08c6c6529 Fix wrong visible tax menu entry 2020-09-08 14:09:56 +02:00
Laurent Destailleur
54c0f673c1 Debug hidden option MAIN_USE_EXPENSE_IK 2020-09-08 12:00:14 +02:00
Laurent Destailleur
86ed4dfa2b Debug hidden option MAIN_USE_EXPENSE_IK 2020-09-08 11:51:36 +02:00
stickler-ci
d6206b49df Fixing style errors. 2020-09-08 09:26:39 +00:00
Sekan, Tobias
a15de8467c fix wrong placed close table tag 2020-09-08 11:25:21 +02:00
stickler-ci
413bb10913 Fixing style errors. 2020-09-08 09:22:02 +00:00
Sekan, Tobias
bd96e0fe42 finished helper method and usage of it 2020-09-08 11:15:33 +02:00
stickler-ci
2569c792e7 Fixing style errors. 2020-09-08 08:13:56 +00:00
Sekan, Tobias
650bb54051 add common list function for module overview 2020-09-08 10:07:34 +02:00
Alexandre SPANGARO
9165ea9e67 Merge remote-tracking branch 'upstream/develop' into 13a11 2020-09-08 08:35:42 +02:00
Laurent Destailleur
f567d41055 Fix php8 2020-09-08 05:16:37 +02:00
Laurent Destailleur
fab24e8c55 Fix phpcs 2020-09-08 05:12:08 +02:00
Alexandre SPANGARO
d1ba6b9476 Merge remote-tracking branch 'upstream/develop' into 13a11 2020-09-08 05:01:36 +02:00
Alexandre SPANGARO
6a04f39fbe Wrong language key 2020-09-08 04:58:42 +02:00
Alexandre SPANGARO
df7ca14b2c Security access 2020-09-08 04:58:25 +02:00
Alexandre SPANGARO
a4c581b34d Modify link on chart of accounts 2020-09-08 04:44:04 +02:00
Alexandre SPANGARO
a050ee8385 Typo 2020-09-08 04:24:27 +02:00
Alexandre SPANGARO
939933f4f7 Add some language key 2020-09-08 04:24:18 +02:00
Laurent Destailleur
f5eb8b0108 Look and feel v13 2020-09-08 04:21:35 +02:00
Laurent Destailleur
198b8d8d2b debugbar ok with php5.6 2020-09-08 02:59:49 +02:00
Laurent Destailleur
4db561656e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-08 02:11:23 +02:00
Laurent Destailleur
1a67b4efeb Debug 2020-09-08 02:11:09 +02:00
Laurent Destailleur
c91338198d Add some fields in candidature 
Look and feel v13
 2020-09-08 01:53:37 +02:00
Alexandre SPANGARO
ca32a93c0b NEW Link on balance to bookkeeping 2020-09-07 22:03:41 +02:00
Alexandre SPANGARO
8c75f0b95b Code optimize 2020-09-07 21:38:39 +02:00
Alexandre SPANGARO
871826d023 Merge remote-tracking branch 'upstream/develop' into 13a8 2020-09-07 21:22:14 +02:00
Laurent Destailleur
b5376d3322 Upgrade lib for phpdebugbar 2020-09-07 21:18:26 +02:00
Laurent Destailleur
c95e54843c Update lib debugbar 
Update php-parallel-lint
 2020-09-07 21:00:40 +02:00
Laurent Destailleur
b6e537a7e5 phpcs 2020-09-07 19:09:19 +02:00
Laurent Destailleur
de2f97ab4e Update gitignore 2020-09-07 19:01:04 +02:00
stickler-ci
61903a1079 Fixing style errors. 2020-09-07 15:24:35 +00:00
Cédric
5992641360
Merge branch 'develop' into patch-3 2020-09-07 17:22:18 +02:00
stickler-ci
a9a95c8a83 Fixing style errors. 2020-09-07 13:47:26 +00:00
Tim Otte
c6cb179447 Added filterable table columns 2020-09-07 15:43:36 +02:00
Florian HENRY
07242a1c5d Merge branch 'develop' into dev_updatedocker 2020-09-07 15:43:03 +02:00
lvessiller
86ce4315be FIX load default linked options for linked sellist extra fields 2020-09-07 15:19:58 +02:00
Laurent Destailleur
26cb294b2e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-07 14:47:37 +02:00
Laurent Destailleur
e7ad8ef3a7 Translation missing 2020-09-07 14:47:25 +02:00
Sekan, Tobias
16bb33b619 Add missing translations for permissions 2020-09-07 14:29:36 +02:00
Laurent Destailleur
e7e05f47ac Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-07 14:26:07 +02:00
Laurent Destailleur
ca6e57b2f7 FIX Filter in "billed" of orders was not saved 2020-09-07 14:25:50 +02:00
lvessiller
5dee3b5b2f FIX no empty value in required extrafield 2020-09-07 14:24:09 +02:00
Laurent Destailleur
e8c5a1c3d6
Merge pull request #14651 from TobiasSekan/NewPermissonsIds 
NEW Show module and permission ids on user/group rights (only admin)
 2020-09-07 12:48:12 +02:00
Laurent Destailleur
92e231e121
Merge pull request #14652 from atm-john/12.0_fix_lang_retained_warranty 
FIX: lang fr retained warranty
 2020-09-07 12:46:32 +02:00
Scrutinizer Auto-Fixer
8aceab802f Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 10:29:37 +00:00
stickler-ci
84ccc91a9c Fixing style errors. 2020-09-07 10:23:15 +00:00
John Botella
10d3405219 FIX: lang fr retained warranty 2020-09-07 12:21:00 +02:00
Laurent Destailleur
753e68b5d9 Fix phpcs 2020-09-07 12:18:00 +02:00
Laurent Destailleur
5a471d38c2
Merge pull request #14611 from atm-adrien/NEW_propal_massAction_validate_sign 
New : add massActions "Validate" and "Sign"
 2020-09-07 12:13:29 +02:00
Laurent Destailleur
570c72f6c9
Update list.php 2020-09-07 12:12:28 +02:00
Sekan, Tobias
fb93b179c1 Show ids on user/group rights (only admin) 2020-09-07 12:09:58 +02:00
Laurent Destailleur
b1e45aef46 Debug opensurvey. Look and feel v13. Removed deprecated properties. 2020-09-07 12:04:50 +02:00
Laurent Destailleur
1f58942e11 Fix phpcs 2020-09-07 10:57:41 +02:00
Adrien Raze
c8c6be2038 Retours PR 2020-09-07 10:50:01 +02:00
Laurent Destailleur
c538dfb5b2 FIX #14646 2020-09-07 10:34:44 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Laurent Destailleur
3c7dbedecd Fix property 2020-09-07 03:05:17 +02:00
Laurent Destailleur
c589c27b78 Fix var init 2020-09-07 02:57:19 +02:00
Laurent Destailleur
be1460e3eb Fix doxygen 2020-09-07 02:49:39 +02:00
Laurent Destailleur
2a952a5307 Fix phpcs 2020-09-07 02:35:04 +02:00
Laurent Destailleur
ba2a9d831f Enhance fetchAll() method 2020-09-07 01:55:13 +02:00
Laurent Destailleur
8679d1e929 Fix phpcs 2020-09-07 01:34:04 +02:00
Laurent Destailleur
1f6c0997f4 Add info when job is closed 2020-09-06 20:48:13 +02:00
Laurent Destailleur
d700649fb9 The deprecated subsitution key __SIGNATURE__ has been removed. Replace 
with __USER_SIGNATURE__ if you still use old syntax in your email
templates.
 2020-09-06 19:25:25 +02:00
Laurent Destailleur
84efd70dcb FIX Clean tooltip of help for substition for long notes 2020-09-06 19:19:55 +02:00
stickler-ci
af91013506 Fixing style errors. 2020-09-06 15:52:02 +00:00
Cédric
03e9e17be4
Merge branch 'develop' into patch-3 2020-09-06 17:50:54 +02:00
Laurent Destailleur
2f3022287e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-05 14:15:33 +02:00
Laurent Destailleur
837697b234 Try to merge manually PR #12500 2020-09-05 14:14:56 +02:00
Laurent Destailleur
52fe2a4d96
Merge pull request #14642 from nlouahedj/develop 
NEW Algeria data (tva and forme_juridique)
 2020-09-05 11:36:47 +02:00
Noureddine LOUAHEDJ
8d7bbe3dcb NEW tva Algerie 2020-09-05 08:58:51 +01:00
Noureddine LOUAHEDJ
ebf718fdae NEW forme_juridique Algerie 2020-09-05 08:58:29 +01:00
Laurent Destailleur
84f4020f49
Update llx_facturedet.sql 2020-09-04 23:12:12 +02:00
Laurent Destailleur
02e07c13c8
Merge branch 'develop' into patch-8 2020-09-04 23:11:00 +02:00
Laurent Destailleur
263989019c
Merge pull request #14493 from aspangaro/13a4 
NEW Accountancy - Add options to disable accounting on sales, purchases & expense reports
 2020-09-04 23:10:15 +02:00
Laurent Destailleur
f04b5c48ea
Update accountancy.lang 2020-09-04 23:09:34 +02:00
Cédric
806cfa84e2
Update llx_product_attribute_combination.sql 2020-09-04 23:08:02 +02:00
Cédric
76a5a42191
Update llx_product_attribute.sql 2020-09-04 23:07:10 +02:00
Cédric
c5fda967c7
add field ref_ext in llx_facturedet 2020-09-04 22:57:21 +02:00
Laurent Destailleur
7e879a8012 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-04 22:44:49 +02:00
Laurent Destailleur
a2db403abe Fix phpcs 2020-09-04 22:44:31 +02:00
Laurent Destailleur
b2c20c3dfd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-04 22:42:48 +02:00
Laurent Destailleur
451c878cfc Fix add missing field 2020-09-04 22:42:37 +02:00
Laurent Destailleur
fba0fd0bed
Merge pull request #14641 from c3do/patch-9 
NEW ref_ext field for Commande lines
 2020-09-04 22:41:24 +02:00
Laurent Destailleur
ca29cc0c77
Merge pull request #14632 from OPEN-DSI/new-ticket-type-severity-group-translated-labels 
NEW translate classification labels in ticket
 2020-09-04 22:39:12 +02:00
Laurent Destailleur
9803da3ac1
Merge pull request #14637 from bafbes/abb120138 
fix : unuseful truncation of list name elements
 2020-09-04 22:38:08 +02:00
Laurent Destailleur
7cc1e30748
Merge pull request #14638 from OPEN-DSI/new-ticket-public-mail-format 
NEW format tickets sent by mail in public interface
 2020-09-04 22:37:18 +02:00
stickler-ci
ebb69e9d6e Fixing style errors. 2020-09-04 19:38:49 +00:00
Cédric
e9d6e04c25
NEW field ref_ext in llx_commandedet 2020-09-04 21:36:01 +02:00
Cédric
0a09284b8f
FIX one time is enough 2020-09-04 21:32:12 +02:00
Cédric
e84a2ab07c
Fix addline commande.class.php 2020-09-04 21:26:57 +02:00
Cédric
c06cb1eff3
NEW ref_ext for order lines 2020-09-04 21:25:20 +02:00
Cédric
1f82fcc1f0
NEW ref_ext field for order lines 2020-09-04 21:11:58 +02:00
Alexandre SPANGARO
247cc71ef4 Merge remote-tracking branch 'upstream/develop' into 13a8 2020-09-04 20:26:05 +02:00
Laurent Destailleur
c8da9f97a8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2020-09-04 19:51:22 +02:00
Laurent Destailleur
2e7f588cac FIX using decimal on stock correction 
Conflicts:
	htdocs/product/stock/product.php
 2020-09-04 19:38:56 +02:00
Cédric
38bc98cf7d
ADD ref_ext field in llx_facturedet 2020-09-04 19:38:24 +02:00
Laurent Destailleur
0c1a5d9e25 FIX using decimal on stock correction 2020-09-04 19:34:20 +02:00
stickler-ci
1cff5e0e03 Fixing style errors. 2020-09-04 17:33:58 +00:00
Cédric
5f4ad2a9fa
NEW ref_ext for Facture lines 2020-09-04 19:32:42 +02:00
Cédric
b60f82966c
Update facture.class.php 2020-09-04 17:54:25 +02:00
lvessiller
123d33b47c NEW format tickets sent by mail in public interface 2020-09-04 17:50:49 +02:00
bahfir abbes
77afbd4412 fix : unuseful truncation of list name elements 2020-09-04 15:58:21 +01:00
Laurent Destailleur
4fdbfa8224 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-04 16:30:55 +02:00
Laurent Destailleur
2e609d448c Fix error message 2020-09-04 16:30:34 +02:00
Sekan, Tobias
0375f5fd37 Add helper function for table headers with numbers 2020-09-04 15:24:45 +02:00
Laurent Destailleur
7094cec42a Fix use same duration code 'on 1 letter' than the production duration 
record, also than tha sprintf.
 2020-09-04 14:37:55 +02:00
lvessiller
4f68c694b8 NEW fetch object useless on create ticket trigger 2020-09-04 14:25:13 +02:00
Laurent Destailleur
f2a16d860e Enhance method fetchByFkProductChild() 2020-09-04 14:05:35 +02:00
Laurent Destailleur
4383f1d00c
Update ProductCombination.class.php 2020-09-04 13:50:22 +02:00
Laurent Destailleur
0ee40402b9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-04 13:35:31 +02:00
Laurent Destailleur
092b66a7f1 Add variation_ref_ext field 2020-09-04 13:35:16 +02:00
Laurent Destailleur
aa031606b9
Merge pull request #14635 from c3do/patch-7 
NEW endpoint getContacts and Clean results
 2020-09-04 13:25:36 +02:00
Laurent Destailleur
e21b3f6681 FIX bad route url to delete subproduct with API 2020-09-04 13:23:11 +02:00
stickler-ci
d743cb6ac2 Fixing style errors. 2020-09-04 11:22:22 +00:00
Laurent Destailleur
35c0bc81e2
Update api_products.class.php 2020-09-04 13:21:10 +02:00
Laurent Destailleur
8e2001a09b
Update api_products.class.php 2020-09-04 13:20:03 +02:00
Laurent Destailleur
9cafd3b97f
Update api_products.class.php 2020-09-04 13:10:30 +02:00
stickler-ci
52c057b9dd Fixing style errors. 2020-09-04 11:06:43 +00:00
Laurent Destailleur
a98c5b9841
Update api_products.class.php 2020-09-04 13:05:30 +02:00
stickler-ci
962bb0c698 Fixing style errors. 2020-09-04 10:59:38 +00:00
Laurent Destailleur
a93cbafe58
Update api_products.class.php 2020-09-04 12:58:30 +02:00
stickler-ci
d6bf70300a Fixing style errors. 2020-09-04 10:57:21 +00:00
Laurent Destailleur
a6f6db6b54
Update api_products.class.php 2020-09-04 12:56:06 +02:00
stickler-ci
334224cd2d Fixing style errors. 2020-09-04 10:55:34 +00:00
Laurent Destailleur
606217fefc
Debug 2020-09-04 12:54:23 +02:00
stickler-ci
8026ee15df Fixing style errors. 2020-09-04 10:52:55 +00:00
Laurent Destailleur
8ca08de5e6
Debug 2020-09-04 12:51:44 +02:00
Laurent Destailleur
b329a9d886
Update api_products.class.php 2020-09-04 12:45:09 +02:00
Laurent Destailleur
1ceb7c8677 Add ref_ext to product_attribute. 2020-09-04 12:41:56 +02:00
Cédric
9141b6b092
NEW endpoint getContacts and Clean results 
NEW Get contacts list of a given order
FIX bad function used to unlink a contact
FIX Result for link contact and unlink contact
 2020-09-04 12:36:03 +02:00
Laurent Destailleur
e5633e07a2
Update api_products.class.php 2020-09-04 12:28:47 +02:00
Laurent Destailleur
6eb1be02ad
Merge pull request #14630 from OPEN-DSI/new-ticket-card-extrafields-errors 
NEW manage errors on update extra fields in ticket card
 2020-09-04 12:27:25 +02:00
Laurent Destailleur
257bb87c53 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-04 12:25:32 +02:00
Laurent Destailleur
07fc85c222 Fix minor 2020-09-04 12:25:16 +02:00
Cédric
704b83c79a
Multiple fix and features 
NEW ref_ext for Attributes and Combinations
Clean and improved results for ::getAttributeValues ::getAttributes ::getAttributesById ::getAttributesByRef
FIX delete subproduct endpoint url
 2020-09-04 12:24:57 +02:00
lvessiller
85575fd604 NEW translate classification labels in ticket 2020-09-04 12:18:32 +02:00
stickler-ci
8d6c19a432 Fixing style errors. 2020-09-04 10:10:37 +00:00
Laurent Destailleur
ef0c9df5ff
Merge pull request #14224 from cfoellmann/disable-eatby-sellby 
NEW Can hide eatby, sellby dates with option PRODUCT_DISABLE_SELLBY and PRODUCT_DISABLE_EATBY
 2020-09-04 12:09:30 +02:00
Laurent Destailleur
564a47e41c
Update productlot_list.php 2020-09-04 12:08:10 +02:00
Cédric
b841a4354e
NEW ref_ext for Attributes 2020-09-04 12:06:09 +02:00
Cédric
93959d34c8
NEW fields ref_ext for Attributes and Combinations 2020-09-04 12:01:01 +02:00
Cédric
3a232796d8
Use new function fetchAllByFkProductChild 2020-09-04 11:43:56 +02:00
Cédric
3d926ff3a1
use function getFkProductParentByFkProductChild 2020-09-04 11:38:40 +02:00
Cédric
0f1c3643d7
Use function getFkProductParentByFkProductChild 2020-09-04 11:21:29 +02:00
Cédric
925a1475a1
add ref_ext to ProductCombination.class.php 2020-09-04 11:01:47 +02:00
lvessiller
eb83941e61 NEW manage errors on update extra fields in ticket card 2020-09-04 10:46:05 +02:00
Juanjo Menent
9bd5ed627f Fix travis issues 2020-09-04 09:55:02 +02:00
lvessiller
22d4382b83 NEW add extra fields labels and values in mail on create ticket 2020-09-04 09:38:33 +02:00
Laurent Destailleur
1408c862f6 css 2020-09-03 21:23:58 +02:00
Laurent Destailleur
614c188486 css 2020-09-03 19:29:00 +02:00
Laurent Destailleur
aafe323405 css 2020-09-03 19:11:56 +02:00
Laurent Destailleur
3f243aa457
Merge pull request #14622 from kev-73/develop 
NEW: add week number for month view in agenda
 2020-09-03 19:02:59 +02:00
Laurent Destailleur
6ecd566697
Merge pull request #14624 from OPEN-DSI/new-ticket-create-send-trackid-and-context 
NEW send context and remove new lines on create ticket
 2020-09-03 18:58:50 +02:00
Laurent Destailleur
a87797ed66 Debug recruitment module 2020-09-03 18:52:09 +02:00
lvessiller
a4f1ddaad0 NEW send context and remove new lines on create ticket 2020-09-03 17:22:27 +02:00
Laurent Destailleur
3ea9266732 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-03 15:29:14 +02:00
Laurent Destailleur
9a232b6164 Fix menu 2020-09-03 15:29:00 +02:00
stickler-ci
43590587e5 Fixing style errors. 2020-09-03 12:30:04 +00:00
Adrien Raze
bcd9a0b29f Retours PR 2020-09-03 14:25:17 +02:00
kev-73
38ed033b8a
New: add week number for month view in agenda 
Agenda, view by month : add a column on left side of agenda, which containt the week number for each line, so for each week. Column width at 2%, no change for width of others columns, because with 14% by defalut, so 14*7=98, the 2% for new column is available. For get date and week number, use fonctions and variables already define in file.
 2020-09-03 14:03:40 +02:00
Laurent Destailleur
457342ee95
Merge pull request #14541 from TobiasSekan/FixSinglePayWithMultiOnPaymentForun 
FIX non-numeric value on multicurrency payment (part 2)
 2020-09-03 13:26:43 +02:00
Laurent Destailleur
f7f42f7680 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-03 13:19:53 +02:00
Laurent Destailleur
661e3c7a11
Merge pull request #14576 from TobiasSekan/ShowBankOnlyWhenActive 
FIX: Show bank account only when bank module is active (on invoices)
 2020-09-03 13:19:32 +02:00
Laurent Destailleur
fe6d42f9e2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-03 12:56:34 +02:00
Laurent Destailleur
ac8c6954bf
Merge pull request #14607 from aspangaro/13a9 
New Accountancy - Balance - Move to getNomUrl on accounting account
 2020-09-03 12:44:31 +02:00
Juanjo Menent
bb92e64e43 FIX: #14474 Error when deleting 2020-09-03 12:43:38 +02:00
Laurent Destailleur
2fe9000286
Merge pull request #14612 from atm-john/develop_fix_and_factor_price_level 
Fix and factor fetch combination price level
 2020-09-03 12:39:06 +02:00
Laurent Destailleur
9293d1917a
Update ProductCombination.class.php 2020-09-03 12:37:30 +02:00
Laurent Destailleur
1d3c54dd64
Update ProductCombination.class.php 2020-09-03 12:36:57 +02:00
Laurent Destailleur
4da10b5f63
Merge pull request #14614 from aspangaro/13a10 
New Accountancy Add predefined url in getNomUrl
 2020-09-03 12:34:24 +02:00
Laurent Destailleur
87113a77b4
Update accountingaccount.class.php 2020-09-03 12:32:51 +02:00
Laurent Destailleur
67e58f639f
Merge pull request #14615 from atm-lena/FIX_selectModelMailFunction 
selectModelMail() : if default and no mail models select default model
 2020-09-03 12:29:59 +02:00
Laurent Destailleur
b0a15f958f
Merge pull request #14619 from atm-john/11.0_fix_missing_param_for_hook 
FIX missing param for hook
 2020-09-03 12:24:56 +02:00
Laurent Destailleur
f88d2bdbbf
Merge pull request #14618 from TobiasSekan/ShowNumAndClickWarehouseArea 
NEW Show header number and make it clickable in warehouse area
 2020-09-03 12:23:45 +02:00
Laurent Destailleur
03d0ccc1cc
Merge pull request #14621 from TobiasSekan/ShowNumAndClickOnPaymentArea 
NEW Show header number and make it clickable on payment area
 2020-09-03 12:20:38 +02:00
Laurent Destailleur
1a33cd91c9
Update index.php 2020-09-03 12:20:20 +02:00
stickler-ci
06e8e62d38 Fixing style errors. 2020-09-03 09:49:35 +00:00
Sekan, Tobias
8f37f66470 Show number and allow click on payment area 2020-09-03 11:36:11 +02:00
Laurent Destailleur
77d15c9382 Fix long name overlap date 2020-09-03 11:34:20 +02:00
Laurent Destailleur
5af1eff2d9 Fix phpcs 2020-09-03 10:46:46 +02:00
John Botella
c17bc8b3c8 Fix missing param for hook 2020-09-03 10:45:03 +02:00
Sekan, Tobias
38da331a8b Show number and clickable on warehouse area 2020-09-03 10:41:42 +02:00
stickler-ci
8c514c8025 Fixing style errors. 2020-09-03 08:24:12 +00:00
Adrien Raze
c043501ee5 Retours PR standard 2020-09-03 10:19:57 +02:00
Adrien Raze
0898a1e28a Merge branch 'NEW_propal_massAction_validate_sign' of https://github.com/atm-adrien/dolibarr into NEW_propal_massAction_validate_sign 2020-09-03 10:06:13 +02:00
Sekan, Tobias
f6b902ad36 Show counts and add links in shipment area 2020-09-03 09:58:28 +02:00
Adrien Raze
675fe05808 Retours PR Standard 2020-09-03 09:51:49 +02:00
atm-lena
197d03f9d9 FIX selectModelMail() : if default and no mail models select default model 2020-09-03 09:23:10 +02:00
Alexandre SPANGARO
b3cd9688d5 Typo 2020-09-02 23:43:47 +02:00
Alexandre SPANGARO
853bacd545 New Accountancy Add predefined url in getNomUrl 2020-09-02 23:43:36 +02:00
Laurent Destailleur
31548c6fbb Better error message 2020-09-02 21:42:29 +02:00
Laurent Destailleur
f642fc9ad9 Fix 2020-09-02 21:40:17 +02:00
Laurent Destailleur
ed743c9dbb Fix phpcs 
More secured sendEmailsReminder()
 2020-09-02 21:39:22 +02:00
Laurent Destailleur
9868140693 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-02 19:20:12 +02:00
Laurent Destailleur
4dca1929e0 Can close a recruitment job 2020-09-02 19:19:47 +02:00
Laurent Destailleur
80f824569a Use english 2020-09-02 19:15:03 +02:00
Laurent Destailleur
a58dcc3886 Doc 2020-09-02 19:10:07 +02:00
Laurent Destailleur
a984c8e969 Use english 2020-09-02 18:57:56 +02:00
Laurent Destailleur
0572d2e46d
Merge pull request #14385 from egils-consulting/translate-variable-name-and-add-hints 
Update api_supplier_invoices.class.php
 2020-09-02 18:22:50 +02:00
Laurent Destailleur
ab938f2299
Merge pull request #14606 from bafbes/abb120137 
new : option to hide complementary actions on member subscription
 2020-09-02 18:10:30 +02:00
Laurent Destailleur
6ccec31fa0
Merge pull request #14605 from Tim-Otte/fix-contact-type-translation 
FIX: Contact type translation
 2020-09-02 18:09:37 +02:00
Laurent Destailleur
6d52721246
Merge pull request #14609 from atm-lena/NEW_AddDefaultMailModelToSelect_EventReminder 
Event Reminder : Add "Default Mail Model" to select Mail Model
 2020-09-02 18:08:40 +02:00
Laurent Destailleur
de3e818ccf
Update html.form.class.php 2020-09-02 18:08:08 +02:00
Laurent Destailleur
31acaf4b4b
Merge pull request #14610 from OPEN-DSI/new-ticket-mail-smtp-config 
NEW can set a dedicated SMTP config for sending email from public ticket interface
 2020-09-02 18:06:37 +02:00
Laurent Destailleur
d913736bd1
Update list.php 2020-09-02 17:59:21 +02:00
Laurent Destailleur
ee003ed499
Update list.php 2020-09-02 17:57:09 +02:00
Laurent Destailleur
2a4f0fc034 Fix backto link 2020-09-02 16:37:02 +02:00
John Botella
cd952f7427 Fix and factor fetch combination price level 2020-09-02 16:24:22 +02:00
stickler-ci
a713286579 Fixing style errors. 2020-09-02 13:58:04 +00:00
lvessiller
27c754e6c8 NEW add send context for ticket 2020-09-02 15:33:18 +02:00
Adrien Raze
d6113acfc8 action presign/prevalidate + action sign/validate + Traductions 2020-09-02 15:20:10 +02:00
atm-lena
7b91c8efc8 Event Reminder : Add "Default Mail Model" to select Mail Model 2020-09-02 09:58:55 +02:00
Alexandre SPANGARO
fb88c68ddb New Accountancy - Balance - Move to getNomUrl on accounting account 2020-09-02 05:15:58 +02:00
Laurent Destailleur
e4557b3dd3 Responsive 2020-09-01 23:04:29 +02:00
Laurent Destailleur
619a9a3679 Look and feel v13 2020-09-01 22:53:49 +02:00
Laurent Destailleur
8e02d39cb3 Fix prefill of end date when event type is rendez-vous 2020-09-01 22:44:03 +02:00
bahfir abbes
47eee354f8 new : option to hide complementary actions 2020-09-01 19:31:44 +01:00
Tim Otte
8a5a171cf8 Added agenda translation 2020-09-01 16:59:40 +02:00
Tim Otte
71471a054d Loaded the required translations 2020-09-01 16:53:42 +02:00
Laurent Destailleur
def2bd5d6d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-01 16:36:26 +02:00
stickler-ci
028275582a Fixing style errors. 2020-09-01 14:26:16 +00:00
Alexandre SPANGARO
0336fe5686 NEW Accountancy - On transfers, select the periodicity by default 2020-09-01 16:18:07 +02:00
Laurent Destailleur
f18a852510
Merge pull request #14599 from TobiasSekan/AllowClickOnAllNumOnCommerceOverview 
NEW Allow click on all header numbers on commerce area
 2020-09-01 15:38:42 +02:00
Laurent Destailleur
eb5ac6e9b0
Merge pull request #14595 from ptibogxiv/patch-355 
NEW standardizes API thirdparties by email with other object
 2020-09-01 15:37:17 +02:00
Florian Mortgat
134a47a93f FIX 10.0 - when the mime file name is different from the filesystem name, the attachment name should be the mime filename 2020-09-01 15:36:35 +02:00
Laurent Destailleur
30dba9af5b
Merge pull request #14593 from ptibogxiv/patch-354 
NEW API get users by email / login
 2020-09-01 15:35:35 +02:00
Laurent Destailleur
a424515835
Merge pull request #14596 from atm-lena/NEW_AgendaEvent_Remind_Part2 
Agenda Remind (Part 2 & 3)
 2020-09-01 15:33:52 +02:00
Laurent Destailleur
a626b252bd
Optimize code 2020-09-01 15:33:02 +02:00
Laurent Destailleur
265d7b2e0e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-01 15:18:10 +02:00
Laurent Destailleur
5d40380a07 Add index on status 2020-09-01 15:17:52 +02:00
atm-lena
1b225706db FIX create remind : dateremind save 2020-09-01 14:48:03 +02:00
Florian HENRY
0099d98096 Merge remote-tracking branch 'origin/develop' into dev_updatedocker 2020-09-01 14:32:49 +02:00
Sekan, Tobias
ba107361fd Allow click all num on comm. overview 2020-09-01 13:20:56 +02:00
stickler-ci
763515a4ca Fixing style errors. 2020-09-01 08:17:19 +00:00
atm-lena
86c6ef23e3 Errors management v2 2020-09-01 10:05:55 +02:00
atm-lena
b747f6285e Errors management 2020-09-01 10:01:59 +02:00
atm-lena
d2ed43d913 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2 2020-09-01 09:43:14 +02:00
atm-lena
13f91f1de8 FIX getEmailTemplat() in sendEmailsReminder() reminder function 2020-09-01 09:41:59 +02:00
Laurent Destailleur
b69a992324 Fix option AGENDA_SUPPORT_PRIORITY_IN_EVENTS 2020-09-01 04:29:57 +02:00
Laurent Destailleur
e353d4a42d Add tooltip if label truncated 2020-09-01 03:59:57 +02:00
Laurent Destailleur
d69f08e489 WIP 2020-09-01 01:24:05 +02:00
ptibogxiv
477f33f56c
NEW standardizes API thirdparties by email with other object 2020-08-31 21:45:51 +02:00
Laurent Destailleur
887d4e0603 Add unique key on table of inventory details 2020-08-31 20:02:06 +02:00
Laurent Destailleur
4110f1df05 Responsive 2020-08-31 19:21:33 +02:00
Laurent Destailleur
9dbc9582c1 Code comment 2020-08-31 17:12:31 +02:00
stickler-ci
fcc2ad8c9b Fixing style errors. 2020-08-31 15:11:05 +00:00
ptibogxiv
c8e0bcd710
NEW API get users by email / login 2020-08-31 17:09:14 +02:00
Laurent Destailleur
0a93954134 Fix regresssion. The reply_to was missing with SMTPS 2020-08-31 17:07:13 +02:00
Laurent Destailleur
0442ed1bd1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-31 17:00:55 +02:00
Laurent Destailleur
49a4f4f1a1 More log 2020-08-31 17:00:43 +02:00
atm-lena
a8c9e76ef6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2 2020-08-31 16:57:49 +02:00
Laurent Destailleur
1a353a5742
Merge pull request #14592 from TobiasSekan/UniformAvailabilityDescOnPropal 
FIX Uniform availability delay description on commercial proposal (new and card)
 2020-08-31 16:25:42 +02:00
Laurent Destailleur
ffb3d810de Complete fix for #14580 for v10 (backport of change of develop) 2020-08-31 16:21:59 +02:00
Laurent Destailleur
54c1be3717
Merge pull request #14560 from ptibogxiv/patch-349 
NEW display resiliate status in takepos for member
 2020-08-31 16:16:39 +02:00
Laurent Destailleur
d11d02a23a
Merge pull request #14586 from ptibogxiv/patch-353 
NEW change thirdparty with barcode scan in takepos
 2020-08-31 16:15:59 +02:00
Laurent Destailleur
deac359502
Merge pull request #14585 from ptibogxiv/patch-352 
NEW api get member by thirdparty
 2020-08-31 16:14:23 +02:00
Laurent Destailleur
0f68854baa
Merge pull request #14591 from TobiasSekan/AvoidUseCurlyBracesOnContactList 
FIX Avoid use of curly braces on contact list (PHP 7.4+)
 2020-08-31 16:13:33 +02:00
Laurent Destailleur
5c2694dcf8
Merge pull request #14584 from ptibogxiv/patch-351 
NEW API get thirdparty by barcode
 2020-08-31 16:08:22 +02:00
Laurent Destailleur
1065e7328e
Merge pull request #14587 from andreubisquerra/master 
NEW Keep takepos terminal when login/logout
 2020-08-31 16:07:09 +02:00
atm-lena
f8c79db4a9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind_Part2 2020-08-31 14:14:27 +02:00
Sekan, Tobias
070a09d5cc Uniform availability desc. on propal 2020-08-31 13:41:22 +02:00
Sekan, Tobias
8b40d17868 avoid use of curly braces on contact list 2020-08-31 08:10:06 +02:00
Laurent Destailleur
3a102cce73 csscss 2020-08-30 20:55:22 +02:00
Laurent Destailleur
8c4e4aba1a css 2020-08-30 20:31:28 +02:00
Laurent Destailleur
83d70c9856 Fix use new navigation 2020-08-30 19:54:34 +02:00
Laurent Destailleur
02f108835d Fix tooltip 2020-08-30 19:45:46 +02:00
Laurent Destailleur
d35e374584 css 2020-08-30 19:32:52 +02:00
Laurent Destailleur
0d4f7cb485 Fix responsive and title of reports 2020-08-30 17:42:49 +02:00
Laurent Destailleur
d94d7a1d0b Sync transifex 2020-08-30 16:28:07 +02:00
Laurent Destailleur
60ead7cefd Trans 2020-08-30 13:22:12 +02:00
Laurent Destailleur
3bef07697c Trans 2020-08-30 13:17:25 +02:00
Laurent Destailleur
e030b2089a Look and feel v13 2020-08-30 13:14:28 +02:00
stickler-ci
59542cfbcd Fixing style errors. 2020-08-30 07:41:57 +00:00
jove@bisquerra.com
862c55ea07 NEW Keep takepos terminal when login/logout 2020-08-30 09:19:35 +02:00
Laurent Destailleur
4c0e1d20d6 FIX CSS 2020-08-30 05:28:01 +02:00
Laurent Destailleur
003566706b FIX CSS 2020-08-30 05:27:07 +02:00
Laurent Destailleur
8bffbb812a css 2020-08-30 05:24:44 +02:00
Laurent Destailleur
60af9925a8 css 2020-08-30 04:57:15 +02:00
Laurent Destailleur
8adf1852b1 Clean code 2020-08-30 03:00:35 +02:00
Florian HENRY
9614dcf9ec fix comment 2020-08-29 18:38:26 +02:00
stickler-ci
e18b85ea87 Fixing style errors. 2020-08-29 14:08:42 +00:00
ptibogxiv
d3024fdd1c
Update index.php 2020-08-29 16:07:01 +02:00
ptibogxiv
a963d6c0fc
NEW change thirdparty with barcode scan in takepos 2020-08-29 16:05:14 +02:00
ptibogxiv
6eeb1d3a96
Update invoice.php 2020-08-29 13:36:52 +02:00
ptibogxiv
a64223f73d
Update api_members.class.php 2020-08-29 12:44:17 +02:00
stickler-ci
96b3474185 Fixing style errors. 2020-08-29 10:40:30 +00:00
ptibogxiv
7fe83b24ba
NEW api get member by thirdparty 2020-08-29 12:38:22 +02:00
ptibogxiv
12676d020a
Update api_thirdparties.class.php 2020-08-29 11:43:56 +02:00
stickler-ci
26f812b73b Fixing style errors. 2020-08-29 09:39:10 +00:00
ptibogxiv
a68d2fe91e
NEW API get thirdparty by barcode 2020-08-29 11:37:16 +02:00
Laurent Destailleur
6293f76692 Debug 2020-08-29 06:17:26 +02:00
Laurent Destailleur
9cba23e458 Fix phpcs 2020-08-29 06:10:18 +02:00
Laurent Destailleur
bca9a84710 Enhance autofill of end date when creating an event 2020-08-29 06:05:52 +02:00
Laurent Destailleur
b721930b3b
Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind 
Agenda Remind (Part 1)
 2020-08-29 05:19:21 +02:00
Laurent Destailleur
1eaba7d889 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-29 05:13:48 +02:00
Laurent Destailleur
f8bd7946a5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-08-29 05:13:20 +02:00
Laurent Destailleur
e4e5ca3934 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-29 05:09:41 +02:00
Laurent Destailleur
84b2929604 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-29 05:09:34 +02:00
Laurent Destailleur
eb0c76f613 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-08-29 05:08:59 +02:00
Laurent Destailleur
723a263cd3 Fix phpcs 2020-08-29 05:07:23 +02:00
Laurent Destailleur
a1a05d55e4
Update admin.lang 2020-08-29 05:03:44 +02:00
Laurent Destailleur
e9c6911a23
Update admin.lang 2020-08-29 05:03:01 +02:00
Laurent Destailleur
bd201052de
Update html.form.class.php 2020-08-29 04:58:07 +02:00
Laurent Destailleur
ca47eb2c9f
Update html.form.class.php 2020-08-29 04:55:24 +02:00
Laurent Destailleur
e80722536d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-29 04:42:29 +02:00
Laurent Destailleur
8e70a731d3 doc 2020-08-29 04:42:14 +02:00
Laurent Destailleur
67a82ac3b5
Merge pull request #14583 from ptibogxiv/patch-350 
New fetch thirdparty by barcode
 2020-08-29 04:28:08 +02:00
Laurent Destailleur
47c5bf5f06 Fix example 2020-08-29 04:22:57 +02:00
Laurent Destailleur
82f93fed92 css 2020-08-29 03:52:27 +02:00
Laurent Destailleur
5eca65f673 css 2020-08-29 02:35:24 +02:00
Laurent Destailleur
983a3c59c8 css 2020-08-29 01:11:08 +02:00
ptibogxiv
00d619d08e
Update societe.class.php 2020-08-28 23:04:05 +02:00
ptibogxiv
8286978ce8
New fetch thirdparty by barcode 
ie: usefull for fidelity card with barcode/qrcode
if this PR ok, i will push PR for get thirdparty by barcode  and change thirdparty by barcode in takepos
 2020-08-28 22:44:58 +02:00
Laurent Destailleur
bf06a34139 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/fourn/facture/paiement.php
 2020-08-28 21:29:35 +02:00
Laurent Destailleur
ad87e753b4 Clean trim on GETPOST (already included inside GETPOST when not 'none' 2020-08-28 21:27:50 +02:00
Laurent Destailleur
144cc52b20
Merge pull request #14540 from TobiasSekan/FixSingelPaymentWithMulticurrency 
FIX non-numeric value on multicurrency payment (part 1)
 2020-08-28 21:17:32 +02:00
Laurent Destailleur
e5398c8f2d
Update paiement.php 2020-08-28 21:16:33 +02:00
Laurent Destailleur
0acb33fc91
Merge pull request #14582 from OPEN-DSI/new-ticket-remove-new-lines-in-mail 
NEW remove new lines in mail on add ticket message
 2020-08-28 21:08:17 +02:00
FlorianMortgat
c25463a4ba + more parentheses around expression for readability 2020-08-28 21:07:11 +02:00
FlorianMortgat
173ad057f9 + parentheses around expression for readability 2020-08-28 20:46:35 +02:00
Laurent Destailleur
25f1f1eafb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-28 19:08:08 +02:00
Laurent Destailleur
04ad25d90f NEW Add the workflow interaction close intervention on closing ticket 2020-08-28 19:07:17 +02:00
Laurent Destailleur
9cd63d68bd
Update admin.lang 2020-08-28 17:58:02 +02:00
lvessiller
c3b095c820 NEW remove new lines in mail on add ticket message 2020-08-28 17:54:57 +02:00
Laurent Destailleur
3f1c2e9d07
Merge pull request #14577 from bafbes/abb120136 
New option to see complete names of partners
 2020-08-28 17:50:18 +02:00
Laurent Destailleur
c4c0b8afd4
Fix 2020-08-28 17:49:30 +02:00
Laurent Destailleur
50b791cfca Fix css 2020-08-28 17:41:15 +02:00
Laurent Destailleur
9950f2ea83
Merge pull request #14581 from OPEN-DSI/new-ticket-add-subject-company-name 
NEW subject title with company name instead of application title in t…
 2020-08-28 17:36:38 +02:00
Laurent Destailleur
0b8d7f329e FIX added information on user list not visible with multiselect 2020-08-28 17:17:22 +02:00
lvessiller
49098218cb NEW subject title with company name instead of application title in ticket message 2020-08-28 16:55:28 +02:00
Florian Mortgat
215085e0e6 FIX: unit price divided by quantity when accepting supplier price proposal 2020-08-28 15:51:39 +02:00
bahfir abbes
a031a10f77 fix:option to see complete names of partners 2020-08-28 13:34:40 +01:00
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
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
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
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
stickler-ci
8ff24282d9 Fixing style errors. 2020-08-27 08:16:32 +00:00
Sekan, Tobias
c2590433fe Show ref in contract form on interventions 2020-08-27 10:11:18 +02:00
atm-lena
9d1fc28eba Fix type reminder "push" to "browser" 2020-08-27 09:35:02 +02:00
atm-lena
bbc554070c Fix 2020-08-27 09:33:40 +02:00
Sekan, Tobias
aa8ec1cd9c Fix empty ref in contract list tool tip 2020-08-27 09:32:00 +02:00
Laurent Destailleur
4127fded2a WIP 2020-08-27 03:14:55 +02:00
ATM john
236d2862af Fix install table 2020-08-26 21:56:50 +02:00
atm-lena
6a60228bc3 Translation 2020-08-26 17:11:32 +02:00
Laurent Destailleur
243f59b9e9 FIX Missing transaction on PO actions 2020-08-26 17:09:45 +02:00
atm-lena
efe60ebc58 Error management 2020-08-26 17:02:34 +02:00
atm-lena
cc29654f47 WIP : rename fk_project to fk_actioncomm + add line to sql file to install 2020-08-26 16:48:09 +02:00
atm-lena
a01d1b58c7 Add fk_email_template 2020-08-26 16:06:20 +02:00
Florian Mortgat
9b3f13458f FIX: missing entity check 2020-08-26 16:02:31 +02:00
atm-lena
cf9337b644 Add fk_project to actioncommreminder object 2020-08-26 15:58:14 +02:00
atm-lena
c10556473f Clean 2020-08-26 15:35:12 +02:00
atm-lena
552e655668 Add field "entity" in actioncommrminder object and table 2020-08-26 15:22:32 +02:00
atm-lena
1267e914dc Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind 2020-08-26 15:16:53 +02:00
atm-lena
d4e6a9871c Update select_type_duration() function 2020-08-26 15:14:07 +02:00
atm-lena
2fb5824836 Calcul date of reminder for event create 2020-08-26 15:12:08 +02:00
atm-lena
d3ac39589a WIP 2020-08-26 12:48:12 +02:00
stickler-ci
eecab28203 Fixing style errors. 2020-08-26 10:22:33 +00:00
ptibogxiv
989130c0ad
Update invoice.php 2020-08-26 12:20:49 +02:00
ptibogxiv
76e276e8e8
Update invoice.php 2020-08-26 12:00:45 +02:00
stickler-ci
32ecf4dd9a Fixing style errors. 2020-08-26 09:46:49 +00:00
ptibogxiv
66cdb1dad0
NEW display resiliate status in takepos for member 2020-08-26 11:44:35 +02:00
atm-lena
42f492877e WIP 2020-08-26 11:36:32 +02:00
atm-lena
3046556d7b Add checkbox "AddReminder" 2020-08-26 11:19:14 +02:00
atm-lena
a4018f41f7 WIP 2020-08-26 10:52:36 +02:00
lvessiller
9268955256 FIX set sales representatives on create company card 2020-08-26 09:40:20 +02:00
Alexandre SPANGARO
0adf267f66 Fix Accountancy Listbyaccount Error missing formfile->getDocumentsLink 2020-08-25 21:31:04 +02:00
Laurent Destailleur
23bb67873f NEW Can edit the list of sending email profiles. 2020-08-25 19:40:17 +02:00
atm-lena
7df993c7ed Add "select_model_mail" function + add select to create event 2020-08-25 17:26:32 +02:00
Anthony Berton
458bc66327 Update list.php 2020-08-25 17:25:34 +02:00
atm-lena
6a94c0f52f Add model type mail 2020-08-25 16:43:57 +02:00
atm-lena
94b2f3c5e1 Add $conf conditions 2020-08-25 12:57:36 +02:00
Laurent Destailleur
6f1a51139c Fix load lang 2020-08-25 12:48:56 +02:00
Laurent Destailleur
7c39543c72 Support trigger in module recruitment 
Enhance generic code of automatic recording events
 2020-08-25 12:47:38 +02:00
atm-lena
25840c2b3d Create Event - Add fields 2020-08-25 12:40:29 +02:00
stickler-ci
2cbb4081fe Fixing style errors. 2020-08-25 10:20:48 +00:00
Sekan, Tobias
a7895f3496 Merge branch 'ShowUserOnExternalCalenderEvents' of https://github.com/TobiasSekan/dolibarr into ShowUserOnExternalCalenderEvents 2020-08-25 12:20:10 +02:00
Sekan, Tobias
4c851884e5 Address feedback 2020-08-25 12:16:44 +02:00
Laurent Destailleur
c2e98c7c90 tooltip 2020-08-25 03:31:31 +02:00
Laurent Destailleur
7b5b3cf8a2 Add br 2020-08-25 02:28:08 +02:00
Laurent Destailleur
8c9f6db856 Label in popup 2020-08-25 02:27:32 +02:00
Laurent Destailleur
f9eccce26c Fix phpcs 2020-08-24 20:43:38 +02:00
Laurent Destailleur
3dfda2ae60 FIX Emailcollector - decode extracted 
NEW Rule "email to" accept wildcard *
 2020-08-24 20:41:27 +02:00
Laurent Destailleur
60d76000d7 Fix bad column name 2020-08-24 17:23:33 +02:00
Laurent Destailleur
21633e3d39 css 2020-08-24 17:10:27 +02:00
Laurent Destailleur
05d82a0684 FIX Error management. Do no try to approve PO if validation fails. 2020-08-24 17:07:30 +02:00
stickler-ci
a60968e95b Fixing style errors. 2020-08-24 14:17:15 +00:00
Christian Foellmann
0e9677fd34 allow default settings for "cond_reglement_id" and "mode_reglement_id" 
(cherry picked from commit 2e5475d181af2e8ceb6ea220424fd1329e72e342)
 2020-08-24 16:08:44 +02:00
Sekan, Tobias
6d2aa6b654 Fix non-numeric value 2020-08-24 15:26:06 +02:00
Sekan, Tobias
4c887d6110 Fix for non-numeric value in payment 2020-08-24 14:53:34 +02:00
ptibogxiv
ff621cb146
Update pay.php 2020-08-24 12:27:19 +02:00
ptibogxiv
9da4946955
Fix for better code 2020-08-24 12:26:40 +02:00
Alexandre SPANGARO
335f57f9be Fix language 2020-08-24 11:41:00 +02:00
Alexandre SPANGARO
eebe888377 Some fix on assets 2020-08-24 09:47:37 +02:00
Christian Foellmann
b1849aed5c fix for mistakenly uncommented code 2020-08-24 07:53:25 +02:00
stickler-ci
721b1275ff Fixing style errors. 2020-08-23 23:20:07 +00:00
StephaneLesage
5aac080e61 NEW Third-Party Import new fields: mother company,outstanding debt limit,bank account,incoterms 2020-08-24 01:01:35 +02:00
Laurent Destailleur
14a4cae95b Fix 2020-08-24 00:31:25 +02:00
Laurent Destailleur
689fa752bf Implement action "Decline" 2020-08-24 00:23:18 +02:00
Laurent Destailleur
633f03e853 Add extrafields for recruitment 2020-08-24 00:09:04 +02:00
andreubisquerra
915aa56a95
Change variable to pos_change 2020-08-23 22:29:55 +02:00
andreubisquerra
8f933c324a
Change variable to pos_change 2020-08-23 22:28:26 +02:00
andreubisquerra
e032ddc035
Change variable to pos_change 2020-08-23 22:27:18 +02:00
andreubisquerra
ec2479a41a
Update 12.0.0-13.0.0.sql 2020-08-23 22:26:22 +02:00
andreubisquerra
f9913be719
Change variable to pos_change 2020-08-23 22:24:46 +02:00
andreubisquerra
a5ab711b27
Change variable to pos_change 2020-08-23 22:22:05 +02:00
Laurent Destailleur
f010e44a71 WIP 2020-08-23 22:13:06 +02:00
Laurent Destailleur
80ccb84fb2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-23 22:11:33 +02:00
Laurent Destailleur
b600478a5a Work on recruitment module 2020-08-23 22:11:16 +02:00
Laurent Destailleur
5aaf567f22
Merge pull request #14364 from bafbes/abb120130 
fix: restore autofill lost functionality on expeditions
 2020-08-23 19:52:21 +02:00
Laurent Destailleur
a6f838a6e0
Update card.php 2020-08-23 19:51:13 +02:00
Laurent Destailleur
0944e8b156 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-23 19:25:13 +02:00
Laurent Destailleur
8115acbf82 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-23 19:25:05 +02:00
Laurent Destailleur
f819509442 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-23 19:22:27 +02:00
Laurent Destailleur
74eac1d06a Fix include regression 2020-08-23 19:22:01 +02:00
Laurent Destailleur
38d53cc03d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2020-08-23 19:20:50 +02:00
Laurent Destailleur
49f8a6e733 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-23 19:17:12 +02:00
Laurent Destailleur
4fa6d86127 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-08-23 19:17:01 +02:00
Laurent Destailleur
7a183ea026
Update pdf.lib.php 2020-08-23 19:13:30 +02:00
Laurent Destailleur
b44d6744f9
Update pdf.lib.php 2020-08-23 19:11:40 +02:00
Laurent Destailleur
7eb003c684
Update pdf.lib.php 2020-08-23 19:11:19 +02:00
Laurent Destailleur
815269db9c FIX #14443 2020-08-23 18:49:19 +02:00
Laurent Destailleur
477c3e719d Fix phpcs 2020-08-23 18:26:42 +02:00
Laurent Destailleur
90e01888d4
Merge pull request #14507 from pstructures/PSdevelop 
Projects added as type in Categories API
 2020-08-23 18:25:08 +02:00
Laurent Destailleur
55c0c1d734
Merge pull request #14514 from FHenry/develop 
fix php warning : count parameters must be countable
 2020-08-23 18:22:35 +02:00
Laurent Destailleur
d23e83779f
Merge branch 'develop' into ParseTranspAndPrioFromExternalCalendar 2020-08-23 18:21:18 +02:00
Laurent Destailleur
2b8a1570f9
Merge pull request #14512 from StephaneLesage/import-product-warehouse-usebatch 
NEW: Products Import/Export 'default warehouse' and 'use batch' fields
 2020-08-23 18:19:59 +02:00
Laurent Destailleur
053aa1b750
Merge pull request #14509 from TobiasSekan/ShowLocationOnImportCalenderEvents 
NEW Show place from events on import calender
 2020-08-23 18:11:02 +02:00
Laurent Destailleur
e32b99fb21
Merge pull request #14515 from ptibogxiv/patch-346 
Fix Stripe icon in balance list
 2020-08-23 18:10:11 +02:00
Laurent Destailleur
9c74211873
Merge pull request #14508 from b92/develop 
NEW Add __TYPE__ substitution key
 2020-08-23 18:09:49 +02:00
Laurent Destailleur
c784c002fd
Merge pull request #14517 from aspangaro/13.0_a5 
Some fix on complete_head_from_modules
 2020-08-23 18:09:15 +02:00
Laurent Destailleur
6685cc5bc8
Update admin.lang 2020-08-23 18:07:18 +02:00
Laurent Destailleur
bd7261a449 Debug recruitment module 2020-08-23 18:04:52 +02:00
Laurent Destailleur
9b7691c8d2
Update admin.lang 2020-08-23 18:04:02 +02:00
Laurent Destailleur
a4c34c2bc5 NEW Add Manufacturing Orders into the automatic ECM 2020-08-23 15:19:03 +02:00
Laurent Destailleur
3fe0ffe7e2 Add unique index on email_msgid of candidatures 2020-08-23 15:18:31 +02:00
Laurent Destailleur
34d2d9a7c6 Look and feel v13 2020-08-23 15:17:22 +02:00
Laurent Destailleur
ca2a34a4c9 Standardize code: Rename fields date_m into tms. All timestamp fields 
are now name "tms".
 2020-08-23 15:15:47 +02:00
Laurent Destailleur
46a6161323 Trans 2020-08-23 13:30:05 +02:00
Alexandre SPANGARO
bf28201685 Fix Missing language key 2020-08-23 07:13:43 +02:00
Alexandre SPANGARO
015e1a8dab Merge branch '12.0' into 12.0_p7 2020-08-23 07:07:47 +02:00
Laurent Destailleur
f56b7c5330 Removed one useless column 2020-08-23 02:45:19 +02:00
Laurent Destailleur
a265bec7ca NEW Events in agenda for contact 
FIX Saving contacts of an events
 2020-08-23 02:38:56 +02:00
andreubisquerra
e36eb42568
Fix travis 2020-08-22 18:46:39 +02:00
andreubisquerra
e8c8cb53cb
Fix travis 2020-08-22 18:45:54 +02:00
jove@bisquerra.com
d9cbd8f998 NEW: Print payment method and change in TakePOS 2020-08-22 18:28:15 +02:00
Laurent Destailleur
e9346298b2 trans 2020-08-22 15:48:42 +02:00
Laurent Destailleur
03af14294a Standardize code. Debug module HRM 2020-08-22 15:29:19 +02:00
Laurent Destailleur
23cda5f464 Enhance recruitment module 2020-08-22 14:37:09 +02:00
Laurent Destailleur
ac1ae7a0d2 Debug 2020-08-22 04:05:31 +02:00
Laurent Destailleur
dabe804299 Add numbering modules for candidatures. Mass action Validate. 2020-08-22 03:49:46 +02:00
Laurent Destailleur
f07a09bc80 Fix missing include 2020-08-22 02:19:58 +02:00
Laurent Destailleur
f4ed84f27d Trans 2020-08-21 22:18:02 +02:00
Laurent Destailleur
a508e7ae08 Migration 2020-08-21 22:17:20 +02:00
Laurent Destailleur
e6616563d2 Fix size of field 2020-08-21 22:01:28 +02:00
Laurent Destailleur
6ad18ceef0 Remove useless code 2020-08-21 19:48:31 +02:00
stickler-ci
183013e9ed Fixing style errors. 2020-08-21 12:02:03 +00:00
Sekan, Tobias
9af5354dfe Parse priority and transparency from external calender events 2020-08-21 13:57:03 +02:00
Laurent Destailleur
1b22de5652 Fix phpcs 2020-08-21 13:22:49 +02:00
Laurent Destailleur
b80ba1179f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/accountancy/expensereport/lines.php
	htdocs/accountancy/supplier/lines.php
 2020-08-21 13:19:28 +02:00
Laurent Destailleur
b6af947042 Fix phpcs 2020-08-21 13:06:54 +02:00
Laurent Destailleur
220fc6db98 Work on recruitment module 2020-08-21 13:00:12 +02:00
stickler-ci
61cce2e700 Fixing style errors. 2020-08-21 06:46:00 +00:00
Sekan, Tobias
22ff5a320f fix not working external calender on/off 2020-08-21 08:40:23 +02:00
Sekan, Tobias
bb1452917b fix wrong event percentage 2020-08-21 08:33:19 +02:00
Sekan, Tobias
ba98db934d Show user on external calender events 2020-08-21 08:18:26 +02:00
Alexandre SPANGARO
065ace5301 Fix Missing language key on rights 2020-08-21 05:26:07 +02:00
Alexandre SPANGARO
76315fa6ac Fix Missing language key on rights 2020-08-21 05:22:31 +02:00
Alexandre SPANGARO
dd87362ce3 Fix Missing language key on rights 2020-08-21 05:20:53 +02:00
Alexandre SPANGARO
646d5cc9c8 Fix Missing language key on rights 2020-08-21 05:19:57 +02:00
Alexandre SPANGARO
881a9b7c04 Fix Missing language key on rights 2020-08-21 05:10:19 +02:00
Alexandre SPANGARO
bd5e35c15f Fix Missing language key 2020-08-21 05:00:38 +02:00
Alexandre SPANGARO
142ce7c03f Fix Missing language key 2020-08-21 04:58:21 +02:00
Laurent Destailleur
461c37c4a8 Clean code 2020-08-21 01:28:40 +02:00
Laurent Destailleur
b2ed69100b Trans 2020-08-21 01:18:06 +02:00
Laurent Destailleur
ad0625b6ec Debug posting message from ticket page 2020-08-21 01:11:22 +02:00
Laurent Destailleur
0390111132 Add column bomtype 2020-08-20 23:32:35 +02:00
Laurent Destailleur
eb15a8e4db Enhance email collector module 2020-08-20 23:03:57 +02:00
Alexandre SPANGARO
f1f579ad67 Some fix on complete_head_from_modules 2020-08-20 22:17:34 +02:00
ptibogxiv
eba4d44c81
Fix Stripe icon in balance list 2020-08-20 20:24:00 +02:00
Laurent Destailleur
3ebcd191bd NEW Add filter rules "is answer" and "is not answer" in email collector 2020-08-20 20:16:38 +02:00
Laurent Destailleur
605642d96a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-20 19:01:03 +02:00
Laurent Destailleur
66f9f37f41 Minor code and doc enhancement 2020-08-20 19:00:43 +02:00
florian HENRY
0453dd8f09 fix php warning : count parameters must be countable 2020-08-20 16:39:14 +02:00
stickler-ci
3c108e8bbf Fixing style errors. 2020-08-20 13:31:48 +00:00
Christian Foellmann
179fc2e70a hide other eatby sellby dates 2020-08-20 15:27:34 +02:00
StephaneLesage
ad6fe8c6b6
NEW: Products Import/Export 'default warehouse' and 'use batch number' fields 2020-08-20 13:51:17 +02:00
Christian Foellmann
a5b4fcedb7 hide eatby sellby in reception 2020-08-20 12:48:23 +02:00
Laurent Destailleur
95c25bc1b7 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-20 12:21:55 +02:00
Laurent Destailleur
fbb162aa9b Trans 2020-08-20 12:21:40 +02:00
Frédéric FRANCE
b4d2bf98fa
Use of undefined constant state - assumed 'state' 2020-08-20 12:14:40 +02:00
Christian Foellmann
b74113e2eb hide eatby sellby on expedition 2020-08-20 12:13:27 +02:00
Christian Foellmann
b777c62557 hide eatby sellby on product/stock/product 2020-08-20 12:13:05 +02:00