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

10267 Commits

Author SHA1 Message Date
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
Laurent Destailleur
5ea47f3ade Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/product/admin/product.php
	htdocs/projet/tasks/list.php
 2020-07-08 18:11:58 +02:00
Laurent Destailleur
96729769f7 Standardize Agenda view 2020-07-08 18:06:14 +02:00
Laurent Destailleur
bec27a04ba Trans 2020-07-07 21:16:20 +02:00
Laurent Destailleur
cb5577826d Look and feel v13 2020-07-07 03:50:14 +02:00
Laurent Destailleur
e13d3ce657 Trans 2020-07-06 20:57:47 +02:00
Laurent Destailleur
9b1163cfb8 Fix menu organisation. 2020-07-06 11:52:28 +02:00
Laurent Destailleur
056aa81ed3 Fix responsive 2020-07-06 10:59:23 +02:00
Alexandre SPANGARO
dc40ddb370 Some correction 2020-07-06 09:56:28 +02:00
Alexandre SPANGARO
59ee22537d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-07-06 03:24:27 +02:00
Laurent Destailleur
344098fe23 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/actions_fetchobject.inc.php
	htdocs/langs/fr_FR/contracts.lang
	htdocs/langs/fr_FR/loan.lang
	htdocs/langs/fr_FR/stocks.lang
 2020-07-05 13:01:00 +02:00
Laurent Destailleur
d18ce3b39e Look and feel v12 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
 2020-07-05 12:54:42 +02:00
Laurent Destailleur
9057559ab5 Trans 2020-07-05 12:47:32 +02:00
Laurent Destailleur
176f678a85 Look and feel v12 2020-07-05 12:46:15 +02:00
Laurent Destailleur
a0d6c9ce70 Trans 2020-07-05 12:30:04 +02:00
Laurent Destailleur
83eaddb17b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/evalmath.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/install/mysql/migration/11.0.0-12.0.0.sql
	htdocs/langs/en_US/cashdesk.lang
	htdocs/societe/class/societe.class.php
 2020-07-04 13:13:17 +02:00
Laurent Destailleur
4819e58d06 Fix trans 2020-07-04 13:04:53 +02:00
Laurent Destailleur
fce81a4bf1 Rename var and fix position of checkbox 2020-07-03 01:30:53 +02:00
Laurent Destailleur
6b3eeebe87
Merge branch 'develop' into dev-replenish 2020-07-03 01:03:35 +02:00
Laurent Destailleur
16b327f106 Debug module credit transfer 2020-07-02 15:45:11 +02:00
jove@bisquerra.com
76f3724191 NEW: Appearance tab in TakePOS with more visual parameters 2020-07-01 22:34:35 +02:00
Laurent Destailleur
5f2486049e Fix trans 2020-07-01 13:22:15 +02:00
Laurent Destailleur
4f1ac84a19 Fix can't find link to edit table plan 2020-06-30 12:07:24 +02:00
Laurent Destailleur
146c521efd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/filefunc.inc.php
 2020-06-29 18:06:42 +02:00
Laurent Destailleur
68b4866438 Trans 2020-06-29 09:43:39 +02:00
Laurent Destailleur
ab88890f3a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-28 21:48:28 +02:00
Laurent Destailleur
4dfd016504
Merge pull request #14140 from fappels/12_missing_translate 
Fix missing translate key
 2020-06-28 21:07:49 +02:00
Laurent Destailleur
a3ae7a76b8 WIP Stock at date 2020-06-28 19:35:24 +02:00
Laurent Destailleur
d22a0f702e WIP Stock at date 2020-06-28 17:34:30 +02:00
Laurent Destailleur
90d4458aab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2020-06-27 00:38:51 +02:00
Francis Appels
f4494db73f Fix missing translate key 2020-06-26 17:34:11 +02:00
Laurent Destailleur
29ba9c82c3 Fix #14120 2020-06-26 17:17:13 +02:00
Laurent Destailleur
c32151d356 Prepare page for stock at date 2020-06-25 01:07:30 +02:00
Laurent Destailleur
ee5156034d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-24 20:03:40 +02:00
Laurent Destailleur
02e022ebfa Fix class not found for supplier credit. Class must be into 
commoninvoice
 2020-06-24 19:59:06 +02:00
Laurent Destailleur
de62037ba5 Fix signed only in margin calculation of project 2020-06-24 12:58:10 +02:00
Laurent Destailleur
6d25b8630b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/prelevement.php
	htdocs/core/class/rssparser.class.php
 2020-06-23 11:38:20 +02:00
Laurent Destailleur
566c1aaf84 Fix for credit transfer module 2020-06-22 22:54:33 +02:00
Laurent Destailleur
501fd2f7a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/admin/receipt.php
 2020-06-21 20:48:41 +02:00
Marc Guenneugues
f86f4c1e1d Change label of checkbox to be more explicit 2020-06-21 19:02:20 +02:00
Laurent Destailleur
cdcc87a565 Fix lang 2020-06-21 15:25:34 +02:00
Laurent Destailleur
ccc55dcb1e Debug Receipt printer module and reduce duplicate translation key 2020-06-20 15:19:19 +02:00
Laurent Destailleur
c54294285a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.form.class.php
 2020-06-20 12:28:14 +02:00
jove@bisquerra.com
ad432e1e9b Printable QR 2020-06-20 12:20:53 +02:00
Laurent Destailleur
450c340cb1 Trans 2020-06-20 12:19:25 +02:00
Laurent Destailleur
f24e73141e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-19 14:53:31 +02:00
Laurent Destailleur
15af3d68fc FIX #13877 2020-06-19 14:50:33 +02:00
Laurent Destailleur
01914980d9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/notice.php
 2020-06-19 00:45:06 +02:00
Laurent Destailleur
4cfe1fcd6b Typo 2020-06-18 15:57:50 +02:00
Laurent Destailleur
a607ff4c1a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/core/lib/project.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/products.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/langs/fr_FR/ticket.lang
	htdocs/mrp/mo_card.php
 2020-06-18 15:50:31 +02:00
Laurent Destailleur
ade542eee7 Sync language 2020-06-18 10:05:00 +02:00
Laurent Destailleur
fded55ddef Fix sepa supplier count 2020-06-18 03:44:26 +02:00
Laurent Destailleur
1ed649ff28 Fix tooltip on project not visible sometimes 2020-06-18 02:50:46 +02:00
Laurent Destailleur
dc70cab2cb Fix tooltip 2020-06-17 22:29:05 +02:00
Laurent Destailleur
6c2d70d43b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-17 19:27:39 +02:00
Laurent Destailleur
adb988a18b FIX Add missing label of event for #14094. Still missing link to object 2020-06-17 15:45:26 +02:00
Laurent Destailleur
c36c8ed447 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
 2020-06-17 15:28:19 +02:00
Laurent Destailleur
1a7f0741b5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/fourn/class/paiementfourn.class.php
 2020-06-17 14:53:24 +02:00
Laurent Destailleur
6d6abd4320 FIX vulenrability reported by wizlynx WLX-2020-012 2020-06-17 14:45:15 +02:00
Laurent Destailleur
9f69e31950
Merge pull request #14089 from atm-quentin/NEW_hide_contract_closed_lines 
NEW hide closed contract lines
 2020-06-17 12:11:00 +02:00
Laurent Destailleur
faf4da0d68
Merge branch 'develop' into fixloan2 2020-06-16 22:40:45 +02:00
atm-quentin
e3d94d44ab NEW hide closed contract lines 2020-06-16 10:45:49 +02:00
Laurent Destailleur
e28bbfbd63 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-15 16:10:49 +02:00
Laurent Destailleur
7b64e8643f Trans and css 2020-06-15 16:08:48 +02:00
DEMAREST Maxime (Indelog)
4df658ccb2 Fix and improvement on Loan module 
* Fix page redirection on loan delete.
* Add dedicated status for loan with started payment (show if payment is
  started on loan card).
* Add fk_payment_loan property for loan_schedule and add link to loan payment
  on shedule page for paid line.
* Make it not possible to use schedule if start loan payment without it (else
  values in schedule can't be good).
* If modify capital in payment with schedule set, automatically updates it
  with the new value.
* Can't modify interest in payment if schedule is used (causes the
  inconsistency for value in schedule).
* User right verification on schedule page.
 2020-06-13 09:32:44 +02:00
Laurent Destailleur
cc9a964b5d
Update products.lang 2020-06-12 01:58:47 +02:00
Laurent Destailleur
fa3ca5c644
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-06-12 01:00:15 +02:00
Laurent Destailleur
90b5ed9908 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
 2020-06-11 23:41:35 +02:00
Laurent Destailleur
e087edf005 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/ticket/class/ticket.class.php
 2020-06-11 23:39:26 +02:00
Laurent Destailleur
ffb345e724
Merge pull request #14062 from atm-florianm/11.0_FIX_missing_translation 
FIX: missing translation value for key "NoMorePredefinedProductToDispatch"
 2020-06-11 23:05:55 +02:00
Anthony Berton
bda4753e41
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-06-11 18:44:38 +02:00
Laurent Destailleur
4b2a570a23 Error message 2020-06-09 22:44:25 +02:00
Laurent Destailleur
a86e209a75 Fix message 2020-06-09 22:43:37 +02:00
Laurent Destailleur
c175fbd697 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/website/class/website.class.php
	htdocs/website/index.php
 2020-06-09 22:09:57 +02:00
Laurent Destailleur
756ef0b583 Fix disallow < > into meta info 
Fix message page regenerated
 2020-06-09 21:43:42 +02:00
Florian Mortgat
d19febc2ca FIX: missing translation value for key "NoMorePredefinedProductToDispatch" 2020-06-09 17:34:24 +02:00
Laurent Destailleur
0f1447cf05 Fix position of clone 2020-06-08 23:42:48 +02:00
Laurent Destailleur
ff9312c96a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/class/ligneprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/line.php
 2020-06-08 20:36:54 +02:00
Laurent Destailleur
233c7e53f1 Debug v12 2020-06-08 20:31:09 +02:00
Laurent Destailleur
cf976a2b98 Fix translation 2020-06-08 17:00:58 +02:00
Laurent Destailleur
2e06ce306a Tooltip 2020-06-08 15:03:10 +02:00
Laurent Destailleur
70bdd59548 Fix trans 2020-06-08 11:52:43 +02:00
Laurent Destailleur
c386f4b2e3 Maxi debug of direct debit order 2020-06-08 11:43:20 +02:00
Laurent Destailleur
7d3039d41f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/user/card.php
 2020-06-06 23:04:55 +02:00
Laurent Destailleur
19405d5f5b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2020-06-06 23:02:05 +02:00
Laurent Destailleur
cbafbe16a2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/supplier/index.php
	htdocs/admin/mails_templates.php
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/langs/en_US/admin.lang
 2020-06-06 23:00:24 +02:00
Laurent Destailleur
da672c8776 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/admin/translation.php
	htdocs/core/class/html.formfile.class.php
	htdocs/societe/card.php
 2020-06-06 11:57:31 +02:00
Laurent Destailleur
d252248319 Fix back to link in ECM menu 
Fix picto in search_page
 2020-06-05 13:41:33 +02:00
Laurent Destailleur
f92426034f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/index.php
 2020-06-03 01:06:27 +02:00
Laurent Destailleur
a2287b3061 Trans 2020-06-02 20:19:14 +02:00
gauthier
68bb552dcc FIX : Tickets mail models doesn't work 2020-06-02 17:06:49 +02:00
Laurent Destailleur
a9973ad60e Fix language key and css 2020-06-02 15:30:07 +02:00
Laurent Destailleur
9a30d4ca44 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-02 13:32:02 +02:00
Laurent Destailleur
3b4fe0d582 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/product/class/html.formproduct.class.php
 2020-06-02 13:31:22 +02:00
Laurent Destailleur
5141fe0a74
Merge pull request #14017 from andreubisquerra/12.0 
Fix QR and add QR customer menu
 2020-06-01 20:07:21 +02:00
Florian Mortgat
3213148d87 FIX 11.0 - when using pdftk as per hidden conf USE_PDFTK_FOR_PDF_CONCAT, check that the file exists before displaying a success message 2020-06-01 17:12:02 +02:00
andreubisquerra
c60982ce60
Update langs 2020-06-01 16:58:05 +02:00
Laurent Destailleur
c04903d15c Fix debug modulebuilder for doc and ref generation 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2020-05-31 23:01:13 +02:00
Laurent Destailleur
e2bb04dcae Fix debug modulebuilder for doc and ref generation 2020-05-31 22:59:33 +02:00
Laurent Destailleur
8dbc0ff040 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/prelevement.php
	htdocs/admin/system/phpinfo.php
	htdocs/modulebuilder/index.php
 2020-05-31 00:31:14 +02:00
Laurent Destailleur
8146e4fdbd Fix tooltip 2020-05-30 02:17:10 +02:00
Laurent Destailleur
156f09729e Debug module Payment by credit transfer 2020-05-30 02:10:41 +02:00
Laurent Destailleur
0a8b90c4e8 Debug module Payment by credit transfer 2020-05-30 02:10:02 +02:00
Laurent Destailleur
926a9f68c4 Trans 2020-05-30 00:23:14 +02:00
Laurent Destailleur
30aa50684f Trans 2020-05-29 21:47:59 +02:00
Laurent Destailleur
9d2f67bf8c Trans 2020-05-29 16:35:01 +02:00
Laurent Destailleur
91f5f8053a Fix label 2020-05-29 13:46:27 +02:00
Laurent Destailleur
f38118790e Trans 2020-05-29 12:18:47 +02:00
Laurent Destailleur
2836368017 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/filefunc.inc.php
	htdocs/takepos/css/phone.css
	htdocs/takepos/invoice.php
 2020-05-28 20:20:39 +02:00
Laurent Destailleur
f8b92e507c Clean code 2020-05-28 19:10:06 +02:00
Laurent Destailleur
cf924e11e9
Merge pull request #13825 from bb2a/Add-option-in-stock-for-affect-warehouse- 
NEW Add option to define a default warehouse at user level
 2020-05-28 18:41:54 +02:00
Laurent Destailleur
a92e952960 Merge branch 'NewVendorInvoiceArea' of 
https://github.com/TobiasSekan/dolibarr into
TobiasSekan-NewVendorInvoiceArea

# Conflicts:
#	htdocs/langs/en_US/bills.lang
 2020-05-28 18:32:52 +02:00
Laurent Destailleur
1e76101c41 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-28 18:30:32 +02:00
Laurent Destailleur
791d147992 Merge branch 'NewCustomerInvoiceArea' of 
https://github.com/TobiasSekan/dolibarr into develop

# Conflicts:
#	htdocs/langs/en_US/bills.lang
 2020-05-28 18:29:59 +02:00
Laurent Destailleur
2f0a5b2634
Merge pull request #13976 from OPEN-DSI/new_ticket_public_notify_new_message 
NEW Ticket message notifications when edited from public interface
 2020-05-28 17:31:26 +02:00
Laurent Destailleur
88475025af Trans 2020-05-28 12:04:52 +02:00
Laurent Destailleur
32aecb553b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2020-05-28 11:44:58 +02:00
Laurent Destailleur
45615081ec FIX Bad use/detetion of text/html when forging template email. 2020-05-28 11:41:48 +02:00
Laurent Destailleur
a2a15ceb5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/core/class/html.form.class.php
 2020-05-27 23:07:18 +02:00
Laurent Destailleur
e37e45f984 Debug credit transfer 2020-05-27 22:35:55 +02:00
Laurent Destailleur
15f2165c12 Fix work on payment by bank transfer (avoid confusion between record) 2020-05-27 20:14:11 +02:00
Anthony Berton
9efcc631d7
Merge branch 'develop' into Add-option-in-stock-for-affect-warehouse- 2020-05-27 14:47:20 +02:00
Laurent Destailleur
16625af34e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/tpl/filemanager.tpl.php
 2020-05-27 14:28:20 +02:00
Laurent Destailleur
3ef1ca1764 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/ecm/class/ecmfiles.class.php
	htdocs/ecm/index.php
 2020-05-27 14:24:03 +02:00
Laurent Destailleur
a207365bd2 FIX XSS using the renaming of .noexe files - reported by Nolan. 2020-05-27 13:12:18 +02:00
kamel
fe8eddac5e [NEW] Ticket message notifications from public interface 
Can send an email when a new message is added from public interface

 close issue #12181
 2020-05-27 11:39:06 +02:00
Laurent Destailleur
0ea8d9f651
Update products.lang 2020-05-26 00:35:01 +02:00
Laurent Destailleur
80ace3b52c Revert due to regressions 2020-05-25 23:05:29 +02:00
Laurent Destailleur
26eab1f285
Merge pull request #13782 from frederic34/free_email 
NEW enable free emails input with select2
 2020-05-25 22:55:36 +02:00
Laurent Destailleur
fd61214b97 Merge 2020-05-24 01:06:45 +02:00
Laurent Destailleur
2b963479a8 Sync transifex 2020-05-23 23:50:00 +02:00
Laurent Destailleur
c843da5272 Sync transifex 2020-05-23 22:29:45 +02:00
Frédéric FRANCE
a7e0fe24ff
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-23 21:44:14 +02:00
Laurent Destailleur
394ea5075f
Merge pull request #13823 from aspangaro/12.0_a25 
NEW: Add quick dropdown menu in top right menu (MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)
 2020-05-23 15:07:27 +02:00
Laurent Destailleur
c2b2e17b58
Merge pull request #13917 from atm-quentin/NEW_showfullarbo_in_getnomurl 
NEW conf to allow show full arbo in warehouse getnomurl
 2020-05-23 15:05:08 +02:00
Laurent Destailleur
5bbbabf653
Update stocks.lang 2020-05-23 15:04:59 +02:00
Laurent Destailleur
abe7472ee5
Update stocks.lang 2020-05-23 15:03:57 +02:00
Laurent Destailleur
4e3fbb9d05
Merge pull request #13912 from TobiasSekan/NewEventMassactionPercent 
NEW mass-actions for the event list view
 2020-05-23 14:26:51 +02:00
Laurent Destailleur
333ae9d496 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-23 12:58:18 +02:00
Laurent Destailleur
aff2872fc1 Fix RSS 2020-05-23 12:57:58 +02:00
Laurent Destailleur
c460cff01c Fix calculation and add tooltip to understand it. 2020-05-23 01:17:01 +02:00
Laurent Destailleur
43103f40a5 Fix make page of categories of web site working 2020-05-22 00:55:34 +02:00
Laurent Destailleur
e81e4032f7 Fix make page of categories of web site working 2020-05-22 00:54:53 +02:00
Laurent Destailleur
15f3c97fff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 23:59:11 +02:00
Laurent Destailleur
a78bc86465 Trans 2020-05-20 23:51:46 +02:00
Laurent Destailleur
e1e5d12524 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 23:23:17 +02:00
Laurent Destailleur
c4d1db263c Fix end of workflow of MO 2020-05-20 23:15:18 +02:00
Laurent Destailleur
954d928467 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 20:11:13 +02:00
Laurent Destailleur
cce72ad8d6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/bills.lang
	htdocs/projet/class/project.class.php
 2020-05-20 20:10:48 +02:00
Laurent Destailleur
6f52c62f2a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/bills.lang
 2020-05-20 19:53:28 +02:00
Laurent Destailleur
434341316b suggest some fix to debug situation invoices 2020-05-20 19:51:04 +02:00
Frédéric FRANCE
365f85dcea
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-20 18:28:55 +02:00
Laurent Destailleur
2f7786f50f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 10:37:43 +02:00
Laurent Destailleur
2ba9d7f288 Fix translation 2020-05-19 21:38:42 +02:00
Frédéric FRANCE
fd7a5473a7
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-19 21:08:15 +02:00
Laurent Destailleur
346082b153 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-19 19:59:24 +02:00
Anthony Berton
702627155c
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-05-19 15:20:18 +02:00
atm-quentin
d61cef28d7 NEW conf to allow show full arbo in getnomurl 2020-05-19 11:16:04 +02:00
Tobias Sekan
0cba74277a
Update agenda.lang 2020-05-19 08:19:14 +02:00
Laurent Destailleur
b3a17c8da4 Look and feel v12 2020-05-19 04:21:38 +02:00
Frédéric FRANCE
b6462462d7
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-18 22:27:32 +02:00
Laurent Destailleur
88c40633d5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-18 15:57:29 +02:00
Laurent Destailleur
756c1fd73d Fix tooltip message 2020-05-18 15:26:04 +02:00
Frédéric FRANCE
54e2d72d8a
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-17 20:44:21 +02:00
Laurent Destailleur
bd564486ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-17 20:03:09 +02:00
Laurent Destailleur
106fe7bde6 Clean conflict between direct debit and direct credit orders. 2020-05-17 15:06:09 +02:00
Laurent Destailleur
af46108cc4 Look and feel v12 2020-05-17 13:34:16 +02:00
Anthony Berton
ceb3ba0e33
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-05-16 16:42:20 +02:00
Frédéric FRANCE
6d59b3f859
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-15 20:57:15 +02:00
Laurent Destailleur
ff07837053 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-15 19:01:54 +02:00
Laurent Destailleur
ff84fd8118 Fix default language of user. Must separate weblangs and pagelangs. 2020-05-15 19:01:12 +02:00
Frédéric FRANCE
b9a082f774
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-15 18:08:51 +02:00
Laurent Destailleur
70fc74008a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
 2020-05-15 17:19:43 +02:00
Laurent Destailleur
86ff60f161 Fix break line and set of opportunity fields 2020-05-15 15:50:50 +02:00
Laurent Destailleur
38059ab861 Fix trans 2020-05-15 15:17:37 +02:00
Frédéric FRANCE
9afe335e4e
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-14 18:45:52 +02:00
Laurent Destailleur
a865dc7232
Merge pull request #13762 from indelog/rappaygroupmod 
NEW possibilty to group payments by mode and show their subtotal
 2020-05-14 16:55:37 +02:00
Laurent Destailleur
aed917bda9
Merge pull request #13862 from aspangaro/12.0_a27 
NEW Accountancy balance - Add a input to show subtotal by group
 2020-05-14 16:40:02 +02:00
Anthony Berton
06c08ad045
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-05-14 15:26:58 +02:00
Laurent Destailleur
ae0e6e4dc8 FIX dol_concatdesc to escape < 
Better help
 2020-05-14 14:30:36 +02:00
Laurent Destailleur
a796122f7b Fix to solve feedbacks of 
https://www.dolibarr.fr/forum/t/email-collector-avec-office-365-bug-et-contournement/32726
 2020-05-14 14:30:32 +02:00
Laurent Destailleur
72c6aa81bb Trans 2020-05-14 14:30:15 +02:00
Laurent Destailleur
bcaa83eeec FIX dol_concatdesc to escape < 
Better help
 2020-05-14 14:10:04 +02:00
Laurent Destailleur
1bd00b0e8c Fix to solve feedbacks of 
https://www.dolibarr.fr/forum/t/email-collector-avec-office-365-bug-et-contournement/32726
 2020-05-14 12:28:17 +02:00
Frédéric FRANCE
be78ef5fb3
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-13 17:53:41 +02:00
Laurent Destailleur
9785e0b852 Trans 2020-05-13 12:30:59 +02:00
Frédéric FRANCE
7e5a07a863
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-12 07:57:32 +02:00
Alexandre SPANGARO
6b57ae4fcb Merge remote-tracking branch 'upstream/develop' into 12.0_a27 2020-05-12 07:27:35 +02:00
Laurent Destailleur
45caa02929
Merge pull request #13854 from bb2a/user-hide-inactive-in-config-module-users 
NEW Add option to hide all inactive users into combo list of users.
 2020-05-12 03:18:21 +02:00
Laurent Destailleur
3c8452aa31
Update admin.lang 2020-05-12 03:17:55 +02:00
Laurent Destailleur
6706d28eb7
Update admin.lang 2020-05-12 03:15:19 +02:00
Laurent Destailleur
e5fa5be0e5
Merge pull request #13861 from aspangaro/12.0_a26 
NEW Bookkeeping by account - Look & feel v12
 2020-05-12 03:02:32 +02:00
Frédéric FRANCE
3e5489f7f6
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-11 18:17:27 +02:00
Laurent Destailleur
02ec282812 Typo 2020-05-11 03:34:30 +02:00
Alexandre SPANGARO
04480847df NEW Accountancy balance - Add a button ShowSubtotalByGroup 2020-05-10 08:28:03 +02:00
Alexandre SPANGARO
f40e978475 Fix delbookkeepingyear - add hook printFieldPreListTitle - Look & Feel v12 2020-05-10 06:28:50 +02:00
Anthony Berton
3644a718d8 1 2020-05-09 01:02:51 +02:00
Frédéric FRANCE
bd7a2d23a0
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-08 21:29:12 +02:00
Alexandre SPANGARO
640158ea4c NEW Accountancy - Add Fiducial Winfic eWinfic WinSis Compta 2020-05-08 13:50:26 +02:00
Laurent Destailleur
e55d9ed3b8 Trans 2020-05-08 03:02:53 +02:00
Laurent Destailleur
206b16410e Revert the option to avoid to introduce a feature that is duplicate with 
already existing view "Events/Agenda". It also keeps a common behaviour
between other tools.
Maxi debug on messages of tickets
 2020-05-07 22:52:32 +02:00
Frédéric FRANCE
3fcd9e6949
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-06 22:17:43 +02:00
Laurent Destailleur
485896614b Add message during password reset 2020-05-06 15:30:00 +02:00
DEMAREST Maxime (Indelog)
128ec6fd78 Add include various payments and loans in accounting report 
For simplified accouning, behaviour not enable by default and must be
  enabed in simplified accounting module admin page (or by global
  settings ACCOUNTING_REPORTS_INCLUDE_VARPAY and
  ACCOUNTING_REPORTS_INCLUDE_LOAN).
 2020-05-06 12:58:41 +02:00
Tobias Sekan
0da091c609
Add missing lang entry 2020-05-06 11:51:50 +02:00
Tobias Sekan
5fb852b588
Add one new lang entry 2020-05-06 11:37:39 +02:00
Frédéric FRANCE
574a4d4ce8
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-06 10:54:59 +02:00
Laurent Destailleur
9f176c5e2d Fix trans 2020-05-06 01:41:10 +02:00
Anthony Berton
c6d2a1faf3 Add options 
Add options in module stock
 2020-05-06 00:48:00 +02:00
Alexandre SPANGARO
489a2cd0cc NEW: Add quick dropdown menu in top right menu 2020-05-05 21:35:03 +02:00
Frédéric FRANCE
93cac43306
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-05 18:37:56 +02:00
Laurent Destailleur
ded0526ca1
Merge pull request #13738 from bb2a/patch-6 
links color for table title line is equal to Text color for table title line
 2020-05-05 18:12:07 +02:00
Laurent Destailleur
821e11ca3c Look and feel v12 2020-05-04 17:13:31 +02:00
Laurent Destailleur
3857c08277 Fix quick search on MO 2020-05-04 13:24:09 +02:00
Anthony Berton
c5544714c2 Traslate title param 2020-05-03 23:10:40 +02:00
Anthony Berton
fdb98dd6ed
Update admin.lang 2020-05-03 10:49:57 +02:00
Anthony Berton
30cb4f0151
Update admin.lang 2020-05-03 10:48:16 +02:00
jove@bisquerra.com
81c808692e NEW Bar Restaurant tab and Auto order 2020-05-02 22:00:04 +02:00
Frédéric FRANCE
44f914fede
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-02 13:29:56 +02:00
Laurent Destailleur
e9c60e64d6 Typo 2020-05-02 12:56:22 +02:00
Marc Guenneugues
640730539e NEW: Add option to include products without alert in replenish 2020-05-02 08:50:22 +02:00
Frédéric FRANCE
10fe016370
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-01 23:14:56 +02:00
Laurent Destailleur
c2c0e6517f Fix init data of units D and H. 2020-05-01 22:44:46 +02:00
Frédéric FRANCE
92898c9562
enable free emails with select2 2020-05-01 11:27:11 +02:00
Tobias Sekan
9e7c0c14d9
Add two new lang entries (admin) 2020-04-29 13:30:58 +02:00
Laurent Destailleur
c22e13b138 FIX Avoid infinite loop when a fetch is inside a compute field. 2020-04-28 14:27:51 +02:00
Laurent Destailleur
dd3a5949c0 FIX Avoid infinite loop when a fetch is inside a compute field. 2020-04-28 14:25:07 +02:00
DEMAREST Maxime (Indelog)
740b2c9228 NEW possibilty to group payments by mode and show their subtotal 
This add two params (PAYMENTS_REPORT_GROUP_BY_MOD and
PAYMENTS_FOURN_REPORT_GROUP_BY_MOD) for payments and supplier payments
to group them by mode and get subtotals for each mode. Add the
corresponding configuration options on admin page fore each payments and
supplier payments.
 2020-04-28 09:01:00 +02:00
kamel
9cb90cb384 NEW: Add prospect status managment for the contact with managment of custom icon 2020-04-27 17:35:14 +02:00
Laurent Destailleur
581d4dbcd9 Look and feel v12 2020-04-27 14:39:38 +02:00
Laurent Destailleur
ed63287797 Fix font 2020-04-27 14:02:18 +02:00
Laurent Destailleur
1121d2c1c6 Look and feel v12 2020-04-25 13:49:44 +02:00
Laurent Destailleur
731864eb4a Removed useless translation keys 2020-04-25 12:43:41 +02:00
Laurent Destailleur
1101c4e587 Fix trans 2020-04-23 18:01:04 +02:00
Laurent Destailleur
46716f2259 Typo 2020-04-23 12:34:37 +02:00
Laurent Destailleur
8f8ae5a4db Fix typo 2020-04-23 12:33:22 +02:00
Laurent Destailleur
496d8f354f Look and feel v12 2020-04-22 17:59:54 +02:00
Laurent Destailleur
eee9e79436 Tooltip 2020-04-22 16:35:25 +02:00
Laurent Destailleur
a5def19cff Fix calculation from a BOM > 1 2020-04-22 12:56:52 +02:00
Frédéric FRANCE
14cdf19bf5
Update modulebuilder.lang 2020-04-21 22:57:48 +02:00
Laurent Destailleur
97b0cabb14 Trans 2020-04-21 18:47:31 +02:00
Laurent Destailleur
042fb4641f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/de_DE/install.lang
	htdocs/langs/de_DE/main.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/projects.lang
 2020-04-21 18:33:11 +02:00
Laurent Destailleur
0b790ef327 Sync lang files 2020-04-21 18:18:07 +02:00
Laurent Destailleur
7b99ebfca5 Debug generic translation of fields 2020-04-21 14:54:30 +02:00
Laurent Destailleur
2f2e3d5057
Merge pull request #13145 from atm-john/12.0_new_extend_retained_warranty 
NEW : Extend retained warranty to be  available for all invoices
 2020-04-18 15:32:33 +02:00
Laurent Destailleur
910aa464d4 Trans 2020-04-18 00:38:37 +02:00
Laurent Destailleur
965bdf733d FIX Can overwrite file if exists in file manager 2020-04-17 13:10:18 +02:00
ATM john
c334a931de Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-04-16 20:29:54 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
 2020-04-16 15:58:59 +02:00
Laurent Destailleur
01ec8693f2 Trans 2020-04-16 15:48:05 +02:00
Laurent Destailleur
855ac5467c FIX setup of suggested payment mode on proposals and orders 2020-04-16 15:40:16 +02:00