lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
105,187 Commits 43 Branches 150 Tags 886 MiB
revert-19608-patch-2
Commit Graph

8983 Commits

Author SHA1 Message Date
Laurent Destailleur
c839c0ceec Trans 2021-11-15 18:44:58 +01:00
Gauthier PC portable 024
7d1b409e59 NEW : accountancy massaction preselect account (productaccount page) 2021-11-15 14:35:55 +01:00
Laurent Destailleur
cd2a09de42
Merge pull request #19170 from atm-john/new_setup_form_help_class 
NEW : setup form class to help setup page creation
 2021-11-15 12:12:25 +01:00
Laurent Destailleur
7a6d84f0d5
Merge pull request #19365 from hregis/fix_add_ldap_hash_type_select 
NEW add ldap password hash type select
 2021-11-15 11:16:33 +01:00
Laurent Destailleur
0227b897d8
Merge pull request #19376 from frederic34/patch-1 
adding a translation
 2021-11-15 10:41:43 +01:00
lmarcouiller
238996b351 Merge branch 'develop#2' of github.com:Hystepik/dolibarr into develop#2 2021-11-15 10:13:27 +01:00
Laurent Destailleur
f086fa6c40 Trans 2021-11-14 18:00:19 +01:00
Frédéric FRANCE
44d81f91e0
adding a translation 
found in htdocs/accountancy/index.php
 2021-11-13 22:13:06 +01:00
Regis Houssin
317060d915 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_add_ldap_hash_type_select 2021-11-12 16:53:39 +01:00
Laurent Destailleur
3b21fc2d37 Better way to report value of stock when PRODUIT_MULTIPRICES is on 2021-11-12 10:50:19 +01:00
Regis Houssin
084a3f48c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
fix_add_ldap_hash_type_select
 2021-11-12 10:10:04 +01:00
Laurent Destailleur
436dbcd81d Shorter pdf label 2021-11-11 15:22:54 +01:00
Laurent Destailleur
47dd7335a9 Debug v15 2021-11-10 21:34:41 +01:00
Frédéric FRANCE
c9517db43b
Update cashdesk.lang 2021-11-10 12:26:28 +01:00
Laurent Destailleur
c858c7bf53 Trans shorter 2021-11-08 14:05:07 +01:00
Laurent Destailleur
cb65903537 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/langs/en_US/bills.lang
 2021-11-08 03:09:30 +01:00
Laurent Destailleur
e8b3875e2e FIX bad sign of amount stored for multicurrency columns on credit notes 2021-11-08 02:57:21 +01:00
Laurent Destailleur
969fe16442 Debug mass actions of partnership module 2021-11-07 16:51:18 +01:00
Laurent Destailleur
ed9806576a Trans 2021-11-07 16:07:16 +01:00
Regis Houssin
3fb0e3c5ad NEW add html.formldap.class.php 2021-11-03 22:56:15 +01:00
Alexandre SPANGARO
13123c3370 Permission language key 2021-11-02 05:31:51 +01:00
Regis Houssin
c5e6893289 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
fix_add_ldap_hash_type_select

Conflicts:
	htdocs/core/class/ldap.class.php
 2021-11-01 11:16:33 +01:00
Regis Houssin
772c3eb43a Works on ldap password hash type 2021-11-01 11:13:44 +01:00
John BOTELLA
c28e9f5f7c Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_setup_form_help_class 2021-11-01 10:08:37 +01:00
Laurent Destailleur
58e55a3d86
Merge pull request #19263 from frederic34/displaydnsspf 
display spf info from dns
 2021-11-01 02:35:32 +01:00
Frédéric FRANCE
8ce70aac5d
display spf info from dns 2021-10-31 18:43:11 +01:00
Laurent Destailleur
d891dd8ddc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
	htdocs/product/stats/card.php
	htdocs/projet/element.php
	htdocs/salaries/card.php
 2021-10-31 16:19:10 +01:00
Laurent Destailleur
e6e440e573 Fix #19257 error in the page Overview of a project 2021-10-31 15:14:15 +01:00
Laurent Destailleur
ffcc6b6d69
Merge pull request #19235 from noec764/14.0_FIX_Error_in_stock_module 
FIX: Replenish: SQL error when no warehouse has been created
 2021-10-31 14:22:31 +01:00
Laurent Destailleur
480ad63c5d
Update stocks.lang 2021-10-31 14:21:01 +01:00
Laurent Destailleur
4e32859bc3
Merge pull request #19243 from yaroslaw74/patch-1 
Requisites
 2021-10-31 13:58:25 +01:00
Alexandre SPANGARO
57a479e328 Remove useless language key 2021-10-31 07:27:37 +01:00
Alexandre SPANGARO
70ed633171 Update label perms 2021-10-31 07:23:34 +01:00
Alexandre SPANGARO
84c3c9d025 Remove useless language key 2021-10-31 07:12:26 +01:00
Alexandre SPANGARO
62ce27886b Remove useless language key 2021-10-31 07:04:31 +01:00
Laurent Destailleur
0017c15974 Debug v15 2021-10-30 17:19:46 +02:00
Ярослав
9b2a6cc2e7
Requisites 
Details of individuals and legal entities for Ukraine
 2021-10-29 09:20:52 +03:00
Administrator
44eedb8c6e FIX: Replenish: SQL error when no warehouse has been created + Warning when there are no warehouses 2021-10-28 12:58:14 +02:00
Laurent Destailleur
d1794d7948 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2021-10-28 11:05:38 +02:00
Laurent Destailleur
5df25fece7 Trans and log 2021-10-27 11:15:26 +02:00
Laurent Destailleur
e9ba9fc103 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 13:52:00 +02:00
Laurent Destailleur
da2ce063b3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/product/card.php
	htdocs/public/emailing/mailing-unsubscribe.php
 2021-10-26 13:42:30 +02:00
Laurent Destailleur
fde44f2792 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 13:29:47 +02:00
Laurent Destailleur
e5a8e41cd9 Trans 2021-10-26 02:00:11 +02:00
Laurent Destailleur
8076357f93
Merge pull request #17185 from bb2a/formconfirm_notification 
[NEW]  Add option for notification in message form
 2021-10-24 13:00:39 +02:00
Laurent Destailleur
9cd59bf2c4
Merge pull request #18508 from henrynopo/patch-3 
NEW Additional reason for Customer's partial payment - bank fees
 2021-10-24 12:54:19 +02:00
John BOTELLA
fdcb9674d8 Remove prints 2021-10-24 02:09:49 +02:00
Jesús Jerez
fc307fb685
Merge branch 'develop' into canceled_orders 2021-10-23 23:24:47 +02:00
Polkiko
a58f713f6d NEW Canceled purchase orders do not qualify for total in project overview (and are hidden) 
If purchase order has been canceled then it does not qualify for total amount and is not shown in table. It can be seen by clicking on the "show/hide" button.
 2021-10-23 23:12:23 +02:00
Laurent Destailleur
7f19682724
Merge pull request #18503 from atm-adrien/NEW_develop_sub_BOM 
NEW : Sub bill of materials
 2021-10-23 18:26:46 +02:00
Laurent Destailleur
d54423990d
Merge pull request #19077 from polkiko/email_contentlines 
FIX Content line substitution in email
 2021-10-22 15:37:45 +02:00
Lucas Marcouiller
daafe652b9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-10-22 14:39:18 +02:00
Polkiko
0c47a88098 FIX Content line substitution in email 2021-10-21 23:53:37 +02:00
Maxime Kohlhaas
860fb21d2d Fix expense report warning display + translations 2021-10-21 23:52:05 +02:00
Lucas Marcouiller
1f64b09430 WIP : fix inventory scan 2021-10-21 18:07:54 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
 2021-10-20 15:06:10 +02:00
Laurent Destailleur
99a939df57
Merge pull request #17518 from bb2a/add_option_pdf_global_with_picture 
[NEW] PDF width picture option
 2021-10-19 19:32:44 +02:00
Laurent Destailleur
3a14cd7a16
Update admin.lang 2021-10-19 19:32:28 +02:00
Adrien Raze
b5b7281094 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_sub_BOM 2021-10-19 16:40:02 +02:00
Laurent Destailleur
6193e31eb4
Merge pull request #18999 from polkiko/payment_receipt 
NEW Added linked files page and send mail possibility in payments
 2021-10-19 12:25:37 +02:00
Laurent Destailleur
5e26e2a71a Trans 2021-10-19 10:54:09 +02:00
Laurent Destailleur
252c910962 Debug feature for proposal signature 2021-10-18 20:46:28 +02:00
Jesús Jerez
43ac3230c3
Merge branch 'develop' into payment_receipt 2021-10-18 19:53:36 +02:00
Laurent Destailleur
297580ed11
Merge pull request #19011 from Hystepik/develop#2 
NEW: Online proposal signature
 2021-10-18 19:41:58 +02:00
Laurent Destailleur
b0230ad42b Look and feel v15 2021-10-18 16:45:14 +02:00
Laurent Destailleur
2262646391 Standardize name of page 2021-10-18 16:04:49 +02:00
lmarcouiller
0c2cf9980d NEW: online propal signature 2021-10-18 14:28:30 +02:00
Laurent Destailleur
e442fcb07e Trans 2021-10-18 12:22:27 +02:00
Polkiko
074b5589bd NEW Added documents page and send mail possibility in payments 
- Documents page has been added to the payments page so that documents can be linked and see the generated pdf documents.
- The possibility of sending payments by email has been added, attaching the payment receipts in pdf.
- In pdf standard model of payment, the possibility of seeing the active iban of a third party has been added if it exists.
 2021-10-18 01:15:12 +02:00
Alexandre SPANGARO
fb30136202 Translation 2021-10-17 08:12:28 +02:00
Laurent Destailleur
bbbc58ec02
Update admin.lang 2021-10-16 18:55:34 +02:00
Florian HENRY
26c50b9e2c add setting to create PDF in PDF/A - 1b format #18990 2021-10-15 11:59:12 +02:00
Laurent Destailleur
5666c63de2
Merge pull request #18850 from atm-gauthier/NEW/integration_GPEC_code 
New : integration gpec, source code
 2021-10-11 15:39:54 +02:00
Laurent Destailleur
dc7143cb77
Merge pull request #18919 from OPEN-DSI/new-takepos-receipt-free-label 
NEW print without details
 2021-10-11 11:23:54 +02:00
Gauthier PC portable 024
de48c1bdde Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code 2021-10-07 11:23:37 +02:00
Laurent Destailleur
2cb0edb5eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/project/suggestbooth.php
	htdocs/public/project/suggestconference.php
 2021-10-07 11:01:53 +02:00
lvessiller
cc21257e3e NEW print without details 2021-10-07 09:51:55 +02:00
Laurent Destailleur
ed6fefc493 Trans 2021-10-07 04:10:39 +02:00
Laurent Destailleur
6cb690e678 Debug v14 2021-10-06 21:56:48 +02:00
Laurent Destailleur
9cf46eaf25 Fix stats graphs 2021-10-06 20:29:48 +02:00
Laurent Destailleur
96b617cb4d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/eventorganization/conferenceorboothattendee_card.php
	htdocs/mrp/mo_list.php
 2021-10-06 18:30:26 +02:00
Gauthier PC portable 024
231f809106 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/integration_GPEC_code 2021-10-06 17:55:36 +02:00
Laurent Destailleur
7e0ec949c0
Merge pull request #18915 from vincentjdc/vat-number-societe-list 
NEW Add `SOCIETE_SHOW_VAT_IN_LIST` to display VAT number in combo list of thirdparties
 2021-10-06 15:33:46 +02:00
Laurent Destailleur
a33ca7d528
Update admin.lang 2021-10-06 15:33:06 +02:00
Vincent Dieltiens
2889af9fae Add SOCIETE_SHOW_VAT_IN_LIST option to let the possibility to display (and search) VAT number in list of 'societe' 2021-10-06 15:23:23 +02:00
Laurent Destailleur
de49e4e375
Merge branch 'develop' into NEW_expense_report_project_required 2021-10-06 14:34:58 +02:00
Laurent Destailleur
6b5ab8025c
Update admin.lang 2021-10-06 14:30:47 +02:00
Laurent Destailleur
92ae3c9d52 Fix label in graph 2021-10-06 14:26:48 +02:00
Laurent Destailleur
ff29ac93ad Debug eventorganization modules 2021-10-06 12:43:40 +02:00
Laurent Destailleur
36a00bc1ac Enhance selection of qty to transfer/correct stock 2021-10-05 20:42:52 +02:00
Gauthier PC portable 024
370af17894 FIX : ihm 2021-10-05 15:21:37 +02:00
Gauthier PC portable 024
5d179beaac FIX : several fixes + travis 2021-10-05 11:14:08 +02:00
Laurent Destailleur
6060f0bfb0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/main.lang
 2021-10-04 14:53:44 +02:00
Laurent Destailleur
6d8276c9c8 Doc 2021-10-04 12:59:53 +02:00
Laurent Destailleur
91ee704dc3 Move trans from admin to main 2021-10-04 12:16:50 +02:00
Laurent Destailleur
7b02560c4f Better way to present open invoice graph 2021-10-04 05:27:07 +02:00
Laurent Destailleur
705644bf07
Merge branch 'develop' into NEW_expense_report_prefill_dates 2021-10-02 21:11:59 +02:00
Laurent Destailleur
a5daf9de9d
Update admin.lang 2021-10-02 21:09:03 +02:00
Gauthier PC portable 024
d01460d606 FIX : hrm_position > hrm_job_user + seEventMessage on evaluation close 2021-10-01 08:06:45 +02:00
Marc de Lima Lucio
d3e90e8f76 NEW: expense reports: conf to force amounts to be entered only including taxes 2021-09-30 17:24:57 +02:00