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

7893 Commits

Author SHA1 Message Date
Laurent Destailleur
23f1137c84
Merge pull request #14920 from rabib-metroworks/import-vendor-invoice 
NEW Can import Supplier invoice
 2020-10-05 16:44:49 +02:00
Alexandre SPANGARO
8ee7861276 Typo 2020-10-05 10:11:19 +02:00
Alexandre SPANGARO
cab6ef092f NEW Accountancy - Add chart of sub accounts 2020-10-05 10:05:21 +02:00
Laurent Destailleur
62177edab1 NEW Can force the antivirus from conf file or autoprepend ini setup. 2020-10-05 05:00:59 +02:00
Laurent Destailleur
fb15277c15 Better tooltip 2020-10-04 23:53:15 +02:00
Ahmad Jamaly Rabib
66a1aa9a86 NEW ADDED IMPORT TOOL FOR SUPPLIER INVOICE 
Added supplier invoice import functionality in import module
 2020-10-05 00:39:35 +06:00
Frédéric FRANCE
7afb62c55d
Merge remote-tracking branch 'upstream/develop' into ecm_extrafields 2020-10-02 00:24:48 +02:00
Frédéric FRANCE
f057488ae3
add extrafields on ecm 2020-10-02 00:21:13 +02:00
Laurent Destailleur
580df3d503
Merge pull request #14880 from rabib-metroworks/import-proposal 
NEW Can import proposals
 2020-10-01 19:09:14 +02:00
Laurent Destailleur
298e94e574 Typo 2020-10-01 11:16:43 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
9447eb2873 Typo 2020-10-01 09:50:09 +02:00
Laurent Destailleur
75ff2eb642 Typo 2020-10-01 09:39:18 +02:00
Laurent Destailleur
91f0429bd2 Fix mention for france, only for FR country 2020-10-01 09:34:10 +02:00
Ahmad Jamaly Rabib
0b35a07290 NEW ADDED IMPORT TOOL FOR PROPOSAL MODULE 
Added proposal import functionality in import module
 2020-10-01 11:52:56 +06:00
Laurent Destailleur
8b2ba8cbba Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/bom/bom_card.php
	htdocs/core/class/ldap.class.php
	htdocs/core/lib/files.lib.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/admin.lang
 2020-09-29 13:28:22 +02:00
Laurent Destailleur
1f8f2c0cc3 NEW Add 2 rules for emailcollector: Message send/not sent from Dolibarr 2020-09-29 13:13:47 +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
2cbec87ddc
Update accountancy.lang 2020-09-28 17:20:41 +02:00
Alexandre SPANGARO
88772726d7 New Add export for various payment 2020-09-28 09:32:49 +02:00
Alexandre SPANGARO
347537a205 Accountancy - Some fix 2020-09-28 06:44:01 +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
4ca481335b
Merge pull request #14812 from atm-john/13.0_new_pdf_storm_for_delivery 
NEW PDF model storm for delivery
 2020-09-27 18:28:22 +02:00
Laurent Destailleur
96ae9c11f6
Revert "NEW Better currency rate editor" 2020-09-27 18:03:56 +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
cb6e4d131f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-27 17:13:41 +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
d60ab93783 Typo 2020-09-27 16:59:27 +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
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
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
John Botella
d3c9a035e9 Add new PDF model storm for delivery 2020-09-23 15:18:53 +02:00
Florian Mortgat
f97e9e4330 FIX: URL parameters vs. POST, tokens, use class CurrencyRate for CRUD 2020-09-23 14:22:27 +02:00
Florian Mortgat
592789c597 Exchange rate editor: +filters 2020-09-22 18:34:59 +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
288fd5566f FIX #14776 2020-09-22 16:02:00 +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
Laurent Destailleur
830bc7d871 Look and feel v13 2020-09-22 09:42:44 +02:00
Laurent Destailleur
aee6bc173f WIP Add start/end date of validity for user/logins 2020-09-21 18:44:20 +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
a3defd621c
Merge pull request #14726 from aspangaro/13a15 
Fix display on quickadd dropdown menu
 2020-09-20 17:30:35 +02:00
Laurent Destailleur
14aa9c01da Neutral message if login / email exists #yohosha4542 2020-09-19 18:40:00 +02:00
Laurent Destailleur
b1985950a6 Use POST to make the ajax set/del constant 2020-09-19 12:50:47 +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
4f2d3176f5 Fix #yogosha4533 2020-09-18 23:26:05 +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
27d03a2034 Better support of SFTP for the FTP module 2020-09-18 00:36:24 +02:00
Laurent Destailleur
e123a4cb84 Fix help on minimum nb of chars 2020-09-17 15:09:29 +02:00
Laurent Destailleur
16b9e62866 FIX #yogosha4456 2020-09-17 14:20:37 +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
5c31593d43 Add date of birth in candidatures 2020-09-16 00:47:44 +02:00
Laurent Destailleur
51963f4c2a css 2020-09-15 13:48:48 +02:00
BENKE Charlene
0aa97a8b02
Update main.lang 2020-09-15 10:59:07 +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
8afd448def Add warning if a hidden option is on to encourage to remove it. 2020-09-14 15:05:35 +02:00
Laurent Destailleur
550cec06a4 Look and feel v12 2020-09-14 14:41:11 +02:00
kkhelifa-opendsi
1f5f784b75
Merge branch 'develop' into email_smtp_allow_auto_signed 2020-09-14 10:25:15 +02:00
Laurent Destailleur
419ac91a7a FIX #14538 2020-09-14 03:34:03 +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
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
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
jove@bisquerra.com
e55c16c039 NEW Weighing Scale compatibility with TakePOS connector 2020-09-13 21:12:14 +02:00
Laurent Destailleur
7d25de5713 Enhance setup page for email setup 2020-09-12 15:39:14 +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
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
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
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
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
7e989c8902 Remove TODO: Button Close possible only if production has started. 2020-09-11 12:36:31 +02:00
Sekan, Tobias
25d6af2b86 Add global search for misc payments +TODO 2020-09-11 09:55:34 +02:00
Alexandre SPANGARO
5b364fc5fa New Accountancy - Add default account for customer deposit 2020-09-10 21:56:55 +02:00
Laurent Destailleur
3eba707e0f Trans 2020-09-10 17:09:32 +02:00
Adrien Raze
b4942707bb EN_US Traductions 2020-09-10 11:23:45 +02:00
Laurent Destailleur
08ab4855f2
Merge branch 'develop' into 13a11 2020-09-09 19:12:08 +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
kamel
ccff18e2a5 NEW : Email configuration - Allow auto signed certificat when ssl activated 2020-09-08 14:48:50 +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
Alexandre SPANGARO
d1ba6b9476 Merge remote-tracking branch 'upstream/develop' into 13a11 2020-09-08 05:01:36 +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
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
Alexandre SPANGARO
871826d023 Merge remote-tracking branch 'upstream/develop' into 13a8 2020-09-07 21:22:14 +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
1f6c0997f4 Add info when job is closed 2020-09-06 20:48:13 +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