lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
90,110 Commits 43 Branches 150 Tags 886 MiB
099c19cefb
Commit Graph

8508 Commits

Author SHA1 Message Date
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
4630887591 Fix css 2020-09-16 20:09:40 +02:00
Laurent Destailleur
d0c02f3714 FIX #yogosha4426 2020-09-16 14:51:46 +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
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
6dd1f522eb CSS 2020-09-14 22:30:22 +02:00
Laurent Destailleur
f626bd70d0 Look and feel v13 2020-09-14 20:53:42 +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
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
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
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
0d9d9498e2
Update commonobjectline.class.php 2020-09-14 00:13:12 +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
Cédric
acc995a553
Update commoninvoice.class.php 2020-09-12 19:05:33 +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
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
Laurent Destailleur
8d93b76258 Clean code 2020-09-10 17:49:05 +02:00
John Botella
59d5391c2a Add force reload param to load method 2020-09-10 10:41:16 +02:00
Laurent Destailleur
08ab4855f2
Merge branch 'develop' into 13a11 2020-09-09 19:12:08 +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
230b6cdfd4 Add method isLoaded($domain) 2020-09-09 15:14:52 +02: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
John Botella
5a0622c906 FIX cron load lang 2020-09-08 16:14:14 +02:00
Tim Otte
c68928b8d0 Added incoterms to substitution array 2020-09-08 15:53:47 +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
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
9165ea9e67 Merge remote-tracking branch 'upstream/develop' into 13a11 2020-09-08 08:35:42 +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
a050ee8385 Typo 2020-09-08 04:24:27 +02:00
Laurent Destailleur
c91338198d Add some fields in candidature 
Look and feel v13
 2020-09-08 01:53:37 +02:00
Laurent Destailleur
b1e45aef46 Debug opensurvey. Look and feel v13. Removed deprecated properties. 2020-09-07 12:04:50 +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
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
bahfir abbes
77afbd4412 fix : unuseful truncation of list name elements 2020-09-04 15:58:21 +01: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
Juanjo Menent
9bd5ed627f Fix travis issues 2020-09-04 09:55:02 +02:00
Juanjo Menent
bb92e64e43 FIX: #14474 Error when deleting 2020-09-03 12:43:38 +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
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
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
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
lvessiller
27c754e6c8 NEW add send context for ticket 2020-09-02 15:33:18 +02:00
atm-lena
7b91c8efc8 Event Reminder : Add "Default Mail Model" to select Mail Model 2020-09-02 09:58:55 +02: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
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
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
9dbc9582c1 Code comment 2020-08-31 17:12:31 +02:00
Laurent Destailleur
0a93954134 Fix regresssion. The reply_to was missing with SMTPS 2020-08-31 17:07:13 +02:00
Laurent Destailleur
49a4f4f1a1 More log 2020-08-31 17:00:43 +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
8adf1852b1 Clean code 2020-08-30 03:00:35 +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
723a263cd3 Fix phpcs 2020-08-29 05:07:23 +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
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
lvessiller
c3b095c820 NEW remove new lines in mail on add ticket message 2020-08-28 17:54:57 +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
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
1b77dc4e13 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-27 21:19:06 +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
5c1680e9c5
Merge branch 'develop' into master 2020-08-27 19:58:29 +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
atm-lena
acb50950a4 Add a default message to "actioncomm_send" template 2020-08-27 11:31:48 +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
c10556473f Clean 2020-08-26 15:35:12 +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
a4018f41f7 WIP 2020-08-26 10:52:36 +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
atm-lena
25840c2b3d Create Event - Add fields 2020-08-25 12:40:29 +02:00
andreubisquerra
f9913be719
Change variable to pos_change 2020-08-23 22:24:46 +02:00
Laurent Destailleur
b600478a5a Work on recruitment module 2020-08-23 22:11:16 +02:00