lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
93,755 Commits 43 Branches 150 Tags 886 MiB
8c1902be1b
Commit Graph

10417 Commits

Author SHA1 Message Date
Laurent Destailleur
73b40828c8 Trans 2020-10-05 18:15:37 +02:00
Laurent Destailleur
9b768b5eab
Merge pull request #14926 from aspangaro/13a17 
NEW Accountancy - Add chart of sub accounts
 2020-10-05 17:20:14 +02:00
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
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
3eba707e0f Trans 2020-09-10 17:09:32 +02:00
Adrien Raze
b4942707bb EN_US Traductions 2020-09-10 11:23:45 +02:00
Adrien Raze
76d5ce18ca Titres + lien cliquable client + traductions 2020-09-10 11:12:04 +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
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
John Botella
10d3405219 FIX: lang fr retained warranty 2020-09-07 12:21: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
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
Alexandre SPANGARO
247cc71ef4 Merge remote-tracking branch 'upstream/develop' into 13a8 2020-09-04 20:26:05 +02:00
Adrien Raze
bcd9a0b29f Retours PR 2020-09-03 14:25:17 +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
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
Laurent Destailleur
def2bd5d6d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-09-01 16:36:26 +02:00
Alexandre SPANGARO
0336fe5686 NEW Accountancy - On transfers, select the periodicity by default 2020-09-01 16:18:07 +02:00
Laurent Destailleur
5d40380a07 Add index on status 2020-09-01 15:17:52 +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
Laurent Destailleur
d69f08e489 WIP 2020-09-01 01:24:05 +02:00
Laurent Destailleur
ffb3d810de Complete fix for #14580 for v10 (backport of change of develop) 2020-08-31 16:21:59 +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
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
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
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
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
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
5c1680e9c5
Merge branch 'develop' into master 2020-08-27 19:58:29 +02:00
Laurent Destailleur
8b95aa63eb Trans 2020-08-27 18:59:36 +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
bbc554070c Fix 2020-08-27 09:33:40 +02:00
atm-lena
6a60228bc3 Translation 2020-08-26 17:11:32 +02:00
atm-lena
efe60ebc58 Error management 2020-08-26 17:02:34 +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
a4018f41f7 WIP 2020-08-26 10:52:36 +02:00
atm-lena
7df993c7ed Add "select_model_mail" function + add select to create event 2020-08-25 17:26:32 +02:00
atm-lena
6a94c0f52f Add model type mail 2020-08-25 16:43:57 +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
Alexandre SPANGARO
335f57f9be Fix language 2020-08-24 11:41:00 +02:00
Laurent Destailleur
b600478a5a Work on recruitment module 2020-08-23 22:11:16 +02:00
Laurent Destailleur
6685cc5bc8
Update admin.lang 2020-08-23 18:07:18 +02:00
Laurent Destailleur
9b7691c8d2
Update admin.lang 2020-08-23 18:04:02 +02:00
Laurent Destailleur
34d2d9a7c6 Look and feel v13 2020-08-23 15:17:22 +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
Laurent Destailleur
a265bec7ca NEW Events in agenda for contact 
FIX Saving contacts of an events
 2020-08-23 02:38:56 +02:00
jove@bisquerra.com
d9cbd8f998 NEW: Print payment method and change in TakePOS 2020-08-22 18:28:15 +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
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
220fc6db98 Work on recruitment module 2020-08-21 13:00:12 +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
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
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
Laurent Destailleur
fbb162aa9b Trans 2020-08-20 12:21:40 +02:00
Laurent Destailleur
25dfd32e0b
Merge pull request #14456 from andreubisquerra/master 
NEW: Delayed payment in TakePOS
 2020-08-19 14:36:34 +02:00
Laurent Destailleur
6ce9d573e2 Trans 2020-08-18 14:13:36 +02:00
Laurent Destailleur
e65e4a6d47 Beautify for of member module 2020-08-18 11:52:00 +02:00
Alexandre SPANGARO
3e80c71713 NEW Accountancy - Add options to disable binding on sales, purchases & expense reports independently of the modules 2020-08-18 07:38:46 +02:00
Laurent Destailleur
b623d79525
Merge pull request #14488 from egils-consulting/patch-10 
Update admin.lang
 2020-08-17 22:21:09 +02:00
Laurent Destailleur
24703b8fe7
Merge pull request #14487 from aspangaro/13a4 
NEW Add a start date to begin binding in accountancy
 2020-08-17 22:20:46 +02:00
Laurent Destailleur
bdcb945dda Work on inventory 2020-08-17 16:04:12 +02:00
Egil Priskorn
bf18f56056
Update admin.lang 
Small typo
 2020-08-17 15:33:36 +02:00
Alexandre SPANGARO
498431fa6f NEW Add a start date to begin binding in accountancy 2020-08-17 15:27:05 +02:00
Laurent Destailleur
75d368b706 Better translation of option 2020-08-17 14:08:52 +02:00
Laurent Destailleur
816aeadcba
Merge pull request #14465 from atm-john/develop_declinaison_price_multiple_merge 
NEW : Declinaison price level compatibility
 2020-08-16 23:18:49 +02:00
Alexandre SPANGARO
27c36713d3 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-08-16 22:10:02 +02:00
Laurent Destailleur
f6c1a14d50 CSS 2020-08-14 21:22:45 +02:00
Laurent Destailleur
a916f6af59 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2020-08-14 11:09:06 +02:00
Laurent Destailleur
0381cf5665 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/modules/modPaymentByBankTransfer.class.php
	htdocs/filefunc.inc.php
 2020-08-14 11:08:53 +02:00
Laurent Destailleur
056a503200 Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0 
Conflicts:
	htdocs/product/composition/card.php
 2020-08-14 11:06:39 +02:00
Laurent Destailleur
2b393d04e1 Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 11.0 2020-08-14 11:03:48 +02:00
Laurent Destailleur
d35c7ed49b Fix trans 2020-08-14 11:03:12 +02:00
Laurent Destailleur
f0046672fc
Merge pull request #14461 from atm-john/NEW_fill_service_dates 
NEW: new line template: hidden conf to fill service dates from the last service line
 2020-08-14 02:50:24 +02:00
Laurent Destailleur
88c07e86ad Organization of setup for Takepos bar features 2020-08-13 13:46:53 +02:00
John Botella
41cbe6db12 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_declinaison_price_multiple_merge 2020-08-12 10:39:21 +02:00
John Botella
f0268b4aaf Add declinaison price level 2020-08-12 10:14:29 +02:00
John Botella
47e664df8d Merge tag 'develop' of github.com:Dolibarr/dolibarr into NEW_fill_service_dates 2020-08-11 12:28:40 +02:00
jove@bisquerra.com
3be723f3a1 NEW: Delayed payment in TakePOS 2020-08-11 07:49:54 +02:00
John Botella
f014365b65 Fix lang fr 2020-08-10 10:35:50 +02:00
Laurent Destailleur
f132f272f2 Fix missing translation 2020-08-07 14:38:42 +02:00
Laurent Destailleur
7e15abc972 Fix missing translation 2020-08-07 14:34:21 +02:00
Laurent Destailleur
1bb24de555 Can set the language of a user. 2020-08-07 14:22:43 +02:00
Laurent Destailleur
e72e05d5f5 Add field default_lang for users 2020-08-07 13:31:23 +02:00
Laurent Destailleur
e830e7f3d3 Work on recruitment module 2020-08-06 13:14:43 +02:00
Laurent Destailleur
9d79e984dd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/tpl/stockcorrection.tpl.php
 2020-08-06 02:15:04 +02:00
Laurent Destailleur
1cf3422e05 FIX Bad adress of vendor in PDF for PDF of supplier payment 
FIX dol_convertToWord() Bad conversion of number into a string
 2020-08-06 01:56:42 +02:00
Laurent Destailleur
1f02b33195 Work on inventory 2020-08-05 12:25:26 +02:00
Laurent Destailleur
9d4e672475 FIX Debug direct debit module and credit transfer module 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
 2020-08-04 21:12:03 +02:00
Laurent Destailleur
5189e8beea FIX Debug direct debit module and credit transfer module 2020-08-04 20:26:57 +02:00
Laurent Destailleur
da76775fbd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/factures.php
	htdocs/compta/prelevement/fiche-rejet.php
 2020-08-03 21:18:45 +02:00
Laurent Destailleur
f62717a16a FIX Debug module direct debit order. Solve conflict with credit transfer 2020-08-03 20:16:33 +02:00
Laurent Destailleur
fb811a1656 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/database-tables.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/langs/fr_FR/withdrawals.lang
	htdocs/societe/class/societe.class.php
 2020-08-03 14:44:01 +02:00
Laurent Destailleur
e64b8eaf40 Fix debug credit transfer module 2020-08-03 11:21:13 +02:00
Laurent Destailleur
679625daee Trans 2020-08-03 09:51:15 +02:00
Laurent Destailleur
7297950308
Merge pull request #13759 from OPEN-DSI/stcommcontact 
NEW: Add prospect status managment for the contact with managment of custom icon
 2020-08-02 22:01:00 +02:00
Laurent Destailleur
aca20c89f9 Can use a generic email for recruitment 2020-08-02 18:45:42 +02:00
Laurent Destailleur
a300eae994 Sync transifex 2020-08-02 18:33:15 +02:00
Laurent Destailleur
d054aedc80 Sync language 2020-08-02 18:32:54 +02:00
Laurent Destailleur
04903460b1 Add contact on job page 2020-08-02 18:09:53 +02:00
Laurent Destailleur
be34a2c607 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/cashdesk.lang
	htdocs/product/stock/list.php
 2020-08-02 16:06:51 +02:00
jove@bisquerra.com
593c7242c4 NEW: TakePOS Gift Receipt 2020-08-02 11:13:41 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact 2020-07-31 16:41:17 +02:00
Laurent Destailleur
d4e21538db FIX Debug setup of receipt printer module 2020-07-31 13:40:36 +02:00
Laurent Destailleur
255dc71823 Missing translation 2020-07-31 13:20:05 +02:00
Laurent Destailleur
f5d7e94d7e NEW Add a stat page to list popularity of products on invoices 
Merge duplicate pages into 1.
 2020-07-30 19:32:06 +02:00
Laurent Destailleur
0bf678e09e Fix label of extrafields 2020-07-30 14:57:33 +02:00
Laurent Destailleur
c79d617a50 Add public page of job position offers 2020-07-30 03:50:27 +02:00
Laurent Destailleur
91a50038ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/fiche-stat.php
 2020-07-27 19:35:34 +02:00
Laurent Destailleur
8c06e3577d Fix several trouble with diret debit module and credit transfer module 2020-07-27 19:33:24 +02:00
Laurent Destailleur
19b550009b Trans 2020-07-27 02:38:31 +02:00
Laurent Destailleur
4fadd747ae Trans 2020-07-26 19:53:51 +02:00
Laurent Destailleur
dd86c21382 FIX dolGetElementUrl and agenda page for external modules 2020-07-25 03:01:04 +02:00
Laurent Destailleur
6e36fba4f3 NEW Development of module Recruitment 2020-07-24 11:54:57 +02:00
Laurent Destailleur
46fccf8eb1 FIX dolGetElementUrl and agenda page for external modules 2020-07-24 11:53:44 +02:00
Laurent Destailleur
f50fc751ab Trans 2020-07-24 10:02:24 +02:00
Laurent Destailleur
ce3248ab57 Trans 2020-07-24 10:01:05 +02:00
Laurent Destailleur
afbeb026ab Trans 2020-07-24 09:56:14 +02:00
Laurent Destailleur
aefb1483e3 NEW Can change size of logo on PDF documents 2020-07-24 03:36:44 +02:00
Laurent Destailleur
cf89e159bd Typo 2020-07-24 03:19:37 +02:00
Laurent Destailleur
895fe63d3b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-24 01:53:51 +02:00
Laurent Destailleur
0f4e00a2a3 Fix language 2020-07-24 01:43:03 +02:00
Laurent Destailleur
d823bb73c0 Change order of fields for mass stock movement 2020-07-20 01:01:40 +02:00
Laurent Destailleur
c91236244e Enhance Stock at date feature 2020-07-10 20:33:06 +02:00
Laurent Destailleur
a155b20b2f Trans 2020-07-10 16:27:59 +02:00
Laurent Destailleur
96c583b84e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-10 02:28:34 +02:00
Laurent Destailleur
e8dd99a9cd Trans 2020-07-10 01:11:37 +02:00
Laurent Destailleur
d18188d565 Fix missing trans 2020-07-10 00:57:29 +02:00
Laurent Destailleur
bd63b84f8e Fix label of social contribution and button date 2020-07-09 23:18:19 +02:00
Laurent Destailleur
6b5f46624c Fix label of AWP 2020-07-09 16:19:40 +02:00
Laurent Destailleur
a59b37cb72 Trans 2020-07-09 15:44:42 +02:00
Laurent Destailleur
e6b241a083 NEW Show tags and status in search list of website pages 2020-07-09 14:07:41 +02:00
Laurent Destailleur
49faaf750f Trans 2020-07-09 12:39:43 +02:00
Laurent Destailleur
9592fdb3fc CSS 2020-07-09 11:55:16 +02:00