Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
107,811 Commits 36 Branches 189 Tags
53aed716e84f134e8de45cb15b12137bfae345dc
Commit Graph

9099 Commits

Author SHA1 Message Date
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