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
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
Laurent Destailleur
9eb737d02e
Trans
2020-04-16 14:49:27 +02:00
Laurent Destailleur
9c77243d66
Trans
2020-04-16 14:47:23 +02:00
Laurent Destailleur
56996b4aa5
trans
2020-04-16 14:42:08 +02:00
Laurent Destailleur
dd53fcf3ee
Merge pull request #13612 from atm-maxime/new_user_hr_tab
...
New add personal email and phone on user card
2020-04-16 00:54:37 +02:00
Laurent Destailleur
95cf8b6359
FIX Non expected switch from tab timesptent to tab tasks
2020-04-15 14:54:54 +02:00
Maxime Kohlhaas
6e96cbc98d
New add personal email and phone on user card
2020-04-15 10:35:21 +02:00
Laurent Destailleur
6e9cbe5b70
Fix RSS for blogs
2020-04-15 03:32:49 +02:00
ATM john
b70cd84402
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-04-14 14:11:12 +02:00
Laurent Destailleur
e02ac3b518
Trans
2020-04-13 15:57:25 +02:00
Laurent Destailleur
2d59991113
Fix translation
2020-04-13 15:32:14 +02:00
Laurent Destailleur
057a4517c9
Fix rss
2020-04-13 13:38:57 +02:00
Laurent Destailleur
6bc87d6277
Merge pull request #13591 from TobiasSekan/ShowActiveBoxStateOfRssFeed
...
NEW Show active widget state of a RSS feed
2020-04-13 13:29:40 +02:00
Sekan, Tobias
e130faf012
Show active box state of a RSS feed
2020-04-13 10:36:24 +02:00
Laurent Destailleur
d503c1b6be
Fix help
2020-04-12 23:18:21 +02:00
Laurent Destailleur
92b6b1a042
Look and feel v12
2020-04-12 18:13:43 +02:00
Laurent Destailleur
7d430c08d0
Look and feel v12
2020-04-12 16:36:25 +02:00
Laurent Destailleur
6b16a3ad39
NEW Can check all events in one click in setup of audited events
2020-04-12 13:25:19 +02:00
Laurent Destailleur
ca8e1f3ea5
NEW Can replace a string into all pages in website module
2020-04-11 18:18:53 +02:00
Laurent Destailleur
1ed24d3949
Fix trans
2020-04-11 12:42:08 +02:00
Laurent Destailleur
450b1761b1
Fix label
2020-04-11 01:09:26 +02:00
Laurent Destailleur
4ff503d20a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/list.php
htdocs/supplier_proposal/list.php
2020-04-10 02:07:51 +02:00
Laurent Destailleur
6f4ff57612
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/supplier_proposal/list.php
2020-04-10 02:00:22 +02:00
Laurent Destailleur
09f1536c27
Merge pull request #13537 from andreubisquerra/master
...
Add langs and print only no printed order lines
2020-04-09 19:38:30 +02:00
Laurent Destailleur
6a60678186
Look and feel v12
2020-04-09 16:36:39 +02:00
gauthier
3327f1c074
FIX : IHM, unexpected quote
2020-04-09 11:53:03 +02:00
jove@bisquerra.com
ea79c91482
Add langs and print only no printed order lines
2020-04-08 20:02:54 +02:00
Laurent Destailleur
fe614658c8
Look and feel v12
2020-04-08 16:13:29 +02:00
Laurent Destailleur
3a024124e8
Merge pull request #13525 from TobiasSekan/ConfirmDeleteOnFactureCard
...
NEW Confirm file delete on fracture card
2020-04-08 14:53:19 +02:00
Laurent Destailleur
b8a657ec0f
Merge pull request #13509 from andreubisquerra/develop
...
Order printer with 'Receipt printers' module
2020-04-08 14:51:23 +02:00
Laurent Destailleur
2e9b19ff8e
Merge pull request #13526 from TobiasSekan/BetterPHPModulViewAdmin
...
NEW Better php module view admin
2020-04-08 14:38:23 +02:00
Tobias Sekan
3e4bd31274
Update English lang
2020-04-08 11:55:58 +02:00
Tobias Sekan
4703d87c33
Update German lang
2020-04-08 11:52:01 +02:00
Tobias Sekan
3f55177add
revert last change
2020-04-08 11:50:40 +02:00
Tobias Sekan
8453080d3c
Update German lang
2020-04-08 11:47:46 +02:00
Laurent Destailleur
215c7b0e32
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/en_US/compta.lang
2020-04-08 11:42:43 +02:00
Laurent Destailleur
9ef6204f7e
Fix description of reports (use date of invoice not validation date)
2020-04-08 11:40:38 +02:00
Tobias Sekan
a506050fee
Update English lang
2020-04-08 10:33:24 +02:00
Tobias Sekan
bbd7134a0f
Update german lang
2020-04-08 10:31:54 +02:00
Laurent Destailleur
8e7ad726b2
NEW Easier way to setup the different types of tax. Better visibility.
...
FIX edit of tax stamp regenerated the PDF.
2020-04-07 14:06:08 +02:00
andreubisquerra
079bfafa26
Order printer langs
2020-04-06 16:14:01 +02:00
Laurent Destailleur
082b205149
WIP Work on Kanban view for module list
2020-04-06 15:12:42 +02:00
Laurent Destailleur
81f289619d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-04-05 15:47:46 +02:00
Laurent Destailleur
47987f239d
Fix trans
2020-04-05 15:42:39 +02:00
Laurent Destailleur
b6a0432589
Merge pull request #13495 from atm-maxime/new_report_supplier_turnover
...
New report supplier turnover
2020-04-05 03:19:18 +02:00
Maxime Kohlhaas
79e5099c6d
Add menu entries
2020-04-04 18:45:33 +02:00
Laurent Destailleur
493a6d9709
Fix trans
2020-04-04 17:46:41 +02:00
Maxime Kohlhaas
67f9b218c5
New supplier turnover report
2020-04-04 15:38:01 +02:00
Laurent Destailleur
28a1b7af35
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/index.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-04-03 18:07:24 +02:00
Laurent Destailleur
d7e4e5f18c
Fix modulebuilder clone message
2020-04-03 15:14:59 +02:00
Laurent Destailleur
98d2db440a
Complete tooltip
2020-04-02 21:34:51 +02:00
Laurent Destailleur
644d83d799
Rename field to avoid confusion
2020-04-02 19:42:08 +02:00
Laurent Destailleur
386b27a14c
Standardize code
2020-04-02 14:32:54 +02:00
Laurent Destailleur
ec0fe28da8
Merge pull request #13452 from andreubisquerra/master
...
NEW: Cash Control in TakePOS
2020-04-02 12:51:36 +02:00
Laurent Destailleur
184d50171d
Update example for clamav - prefer clamav daemon
2020-04-01 22:01:05 +02:00
ATM john
81adc6913e
change conf usage
2020-04-01 12:12:30 +02:00
ATM john
c466beea3d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-03-31 16:28:43 +02:00
jove@bisquerra.com
d9614ac6fc
Integrate Cash Control in TakePOS
2020-03-30 20:05:45 +02:00
Laurent Destailleur
89cbaa3391
Merge pull request #13440 from atm-maxime/new_bom_cost
...
New bom cost
2020-03-30 19:16:09 +02:00
Laurent Destailleur
4220236aa8
Merge pull request #13425 from andreubisquerra/develop
...
NEW: CUPS printing compatibility for TakePOS
2020-03-30 18:56:14 +02:00
Laurent Destailleur
ff549cad18
Merge pull request #13417 from FHenry/dev_tasklist_columnAndExtrafields
...
NEW : Project task list, add column selector and extrafields
2020-03-30 18:53:42 +02:00
Laurent Destailleur
a886629d08
Fix lang
2020-03-30 15:00:29 +02:00
Laurent Destailleur
2b725ad5d5
Update year in demo data
2020-03-30 14:57:56 +02:00
Maxime Kohlhaas
b0e7bd8a30
Finish BOM cost calculation
2020-03-30 10:20:56 +02:00
Laurent Destailleur
e9fbcb45cf
Fix trans
2020-03-29 21:24:05 +02:00
Laurent Destailleur
239732a234
trans
2020-03-29 03:36:34 +02:00
Laurent Destailleur
d5b107211f
Look and feel v12
2020-03-28 15:20:26 +01:00
Laurent Destailleur
c27592bad2
Clean deprecated params on all fetch_optionals()
2020-03-27 16:02:58 +01:00
florian HENRY
aded72a6fa
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_tasklist_columnAndExtrafields
2020-03-26 08:24:39 +01:00
andreubisquerra
d420656c3f
Update langs
2020-03-25 21:32:58 +01:00
Laurent Destailleur
3c572c1909
Debug multicurrency
2020-03-25 17:24:20 +01:00
florian HENRY
46a4184f15
NEW : Project task list, add column selector and extrafields
2020-03-24 19:50:01 +01:00
Laurent Destailleur
f4a52470e3
Graph use color of status
2020-03-23 19:46:43 +01:00
Laurent Destailleur
c2f0cdc0f6
Look and feel v12. Several minor fixes
2020-03-23 19:35:14 +01:00
Laurent Destailleur
820a21a721
Simple setup tutorial
2020-03-23 18:35:22 +01:00
Laurent Destailleur
d965aad6e6
Some fix to support correctly parallel sales
2020-03-23 14:31:59 +01:00
Laurent Destailleur
700e384639
WIP Edit fields into alternate language
2020-03-22 19:11:21 +01:00
Laurent Destailleur
3d6849dfea
Fix label of tabs
2020-03-22 17:27:08 +01:00
Laurent Destailleur
ce47351b76
Trans
2020-03-22 17:11:58 +01:00
Laurent Destailleur
5f0f376817
Merge pull request #13334 from OPEN-DSI/new-takepos-group-same-product
...
NEW add a parameter to group same product
2020-03-20 10:45:06 +01:00
Laurent Destailleur
87edf27bbf
Merge branch 'develop' into dev_NEW_setup_SeparateurCSV
2020-03-18 19:12:52 +01:00
Laurent Destailleur
aeae8b4300
Merge pull request #13348 from aspangaro/12.0_a21
...
Work on reconcilation of accouting account
2020-03-18 18:56:03 +01:00
florian HENRY
15614abc3f
NEW: add csv separator setup in module admin
2020-03-18 15:08:58 +01:00
Laurent Destailleur
73f2e9e5de
WIP migrate num_paiement into num_payment
...
Fix label for free product in takepos
2020-03-16 19:23:18 +01:00
Laurent Destailleur
4b1dd27c5f
Move takepos.php file into index.php to match other dir structure
2020-03-16 15:41:21 +01:00
VESSILLER
350408d2ac
Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-group-same-product
2020-03-16 11:10:41 +01:00
Alexandre SPANGARO
af5444806d
Work on reconcilation of accouting account
2020-03-16 06:41:14 +01:00
Laurent Destailleur
2cc68fec26
Update accountancy.lang
2020-03-15 11:13:46 +01:00
Alexandre SPANGARO
789529c0e0
Work on reconciliation of accouting account
2020-03-15 07:55:35 +01:00
Laurent Destailleur
92f4250a02
Fxi trans
2020-03-14 22:22:55 +01:00
Laurent Destailleur
3b72005f93
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/filefunc.inc.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cashdesk.lang
htdocs/langs/fr_FR/errors.lang
htdocs/langs/fr_FR/products.lang
htdocs/langs/fr_FR/projects.lang
2020-03-14 00:22:11 +01:00
Laurent Destailleur
f774733fcb
Sync transifex
2020-03-14 00:14:42 +01:00
Laurent Destailleur
880cfd1659
FIX #13332 Add more details on screen and help so it is easier to
...
understand the choices of the computer. Copy code into the automatic
binding to have rule consistent.
2020-03-13 18:10:00 +01:00
VESSILLER
1268bab958
Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-group-same-product
2020-03-13 17:27:04 +01:00
Laurent Destailleur
a437125962
Merge pull request #13341 from OPEN-DSI/new-takepos-numbering-modules
...
NEW add numbering module for cash desk
2020-03-13 16:58:27 +01:00
Laurent Destailleur
618d276349
Merge pull request #13335 from FHenry/dev_ldcompta10
...
NEW : accounting export LD compta version 10
2020-03-13 16:55:42 +01:00
Laurent Destailleur
6f636d6d69
NEW Add field author public alias for blog post on website module
2020-03-12 20:50:36 +01:00
Laurent Destailleur
864c903d05
FIX #13294
2020-03-12 18:55:08 +01:00
VESSILLER
70ebc61c1f
Module TakePos - NEW add numbering module for cash desk
2020-03-12 17:43:59 +01:00
florian HENRY
310bdf6062
NEW : accounting export LD compta version 10
2020-03-12 11:55:26 +01:00
VESSILLER
e7056a9ade
NEW add a parameter to group same product
2020-03-12 11:00:17 +01:00
Laurent Destailleur
fc05e8d768
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/bookmarks/bookmarks.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/en_US/other.lang
2020-03-11 18:03:15 +01:00
Laurent Destailleur
61cb1ec81a
Merge pull request #13185 from atm-john/12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
...
NEW : Allow extrafields on pdf : extend to line desc
2020-03-11 17:12:14 +01:00
Laurent Destailleur
89a8531140
Merge pull request #13237 from aspangaro/12.0_a18
...
NEW: Accountancy - Add mode intra & export for product or service bought
2020-03-11 17:08:49 +01:00
Laurent Destailleur
8609bf9c9c
Merge pull request #13318 from OPEN-DSI/new-takepos-payment-buttons
...
NEW add icon on payment buttons in cash desk
2020-03-11 17:06:04 +01:00
VESSILLER
fc4a98b29c
NEW add const TAKEPOS_NUMPAD_USE_PAYMENT_ICON to use icons on payment buttons
2020-03-11 15:36:36 +01:00
Laurent Destailleur
65fbc24b36
Work on migration script
2020-03-11 14:53:06 +01:00
Laurent Destailleur
406c333849
Fix trans
2020-03-11 13:55:57 +01:00
Laurent Destailleur
26fec2f366
Enhance website
2020-03-11 12:53:41 +01:00
Laurent Destailleur
d6966dd429
Add method to count number of blogs in website
2020-03-10 15:59:48 +01:00
Laurent Destailleur
078112c649
Fix trans
2020-03-10 15:19:24 +01:00
Laurent Destailleur
788692f964
Trans
2020-03-09 09:19:47 +01:00
Laurent Destailleur
6203e042b1
Trans
2020-03-09 09:10:06 +01:00
Laurent Destailleur
d812249047
Move code into functions
2020-03-06 17:13:51 +01:00
Laurent Destailleur
52c236570b
Work on the generic Graphic Reporting tool
2020-03-06 01:18:35 +01:00
Laurent Destailleur
92d6661483
Fix trans
2020-03-05 21:59:44 +01:00
Christian Foellmann
b0f1af8433
add missing translation string "Usage" (projects)
2020-03-04 15:18:50 +01:00
Laurent Destailleur
7d0d0aa75a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2020-03-04 01:56:50 +01:00
Laurent Destailleur
71f19b4e5e
FIX #13267
2020-03-04 00:38:04 +01:00
javierybar
e024ea2647
Update cashdesk.lang
2020-03-01 19:45:18 +01:00
Alexandre SPANGARO
d9b9913e8a
NEW: Accountancy - Add mode intra & export for product or service bought
2020-03-01 04:52:12 +01:00
Laurent Destailleur
f2dba4f621
Merge pull request #13227 from aspangaro/12.0_a16
...
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-29 13:02:43 +01:00
Laurent Destailleur
56704e4029
Add stats of products in MO
2020-02-28 19:26:52 +01:00
Laurent Destailleur
bfb9739ae8
Fix manufacuring efficiency on bom lines.
2020-02-28 16:12:42 +01:00
Alexandre SPANGARO
86d9622360
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-27 10:44:04 +01:00
Laurent Destailleur
8445c1d814
Merge pull request #13199 from dolibit-ut/patch-2
...
Update HOWTO-Translation.txt
2020-02-26 05:12:44 +01:00
Laurent Destailleur
cb9637e38d
Doc
2020-02-25 15:04:56 +01:00
Laurent Destailleur
2c6e7f2917
Tooltip for example on IP restrictions
2020-02-25 13:40:19 +01:00
Laurent Destailleur
dbe770a24f
Trans
2020-02-25 13:07:39 +01:00
UT from dolibit
376e19f621
Update HOWTO-Translation.txt
2020-02-25 13:05:23 +01:00
Laurent Destailleur
6c4d782a81
Trans
2020-02-25 12:48:22 +01:00
VESSILLER
73da62d842
NEW Add product on key "Enter" in search bar
2020-02-24 13:57:36 +01:00
John Botella
98407347e7
Update extrafield printable desc
2020-02-24 13:44:26 +01:00
ATM john
13790422dc
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-02-24 00:18:37 +01:00
Laurent Destailleur
90565e4637
Merge pull request #13179 from atm-john/12.0_new_allow_extrafields_on_pdf
...
NEW allow display extrafields on pdf
2020-02-23 22:55:16 +01:00
Laurent Destailleur
f931b92d36
Merge branch 'new-takepos-batch-decrement' of
...
https://github.com/OPEN-DSI/dolibarr into develop
# Conflicts:
# htdocs/langs/en_US/errors.lang
2020-02-23 22:49:03 +01:00
Laurent Destailleur
d1de562674
Merge pull request #13172 from futurehousestore/productlist2
...
Add Products/Services by popularity in Orders
2020-02-23 22:46:07 +01:00
ATM john
fe4e00b139
Add new params to extrafields forms to allow extrafields to be displayed on pdf documents
2020-02-23 11:32:38 +01:00
Laurent Destailleur
1d34ef213c
Fix error management
2020-02-22 12:19:46 +01:00
ATM john
4117aa56a2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-02-22 11:19:49 +01:00
futurehousestore
16b4e680f7
Add Products/Services by popularity in Orders
2020-02-22 02:45:58 +00:00
Laurent Destailleur
badc4327c2
Merge branch 'develop' into patch-3
2020-02-21 19:45:33 +01:00
Laurent Destailleur
e4b00c5c20
Merge branch 'develop' into master
2020-02-21 18:20:10 +01:00
Laurent Destailleur
7909055ee8
Enhance multilangue support in website module
2020-02-21 11:36:16 +01:00
VESSILLER
71c9b94b22
NEW add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation
2020-02-21 11:08:34 +01:00
javierybar
2942e85e47
More elegant and easy to understand printer setup
2020-02-20 15:16:17 +01:00
Laurent Destailleur
d6d0c9eaef
Merge pull request #12560 from Tetras-Libre/takepos-sort-product
...
NEW Takepos : Sort products by reference
2020-02-20 01:39:52 +01:00
Laurent Destailleur
895503d2eb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/index.php
htdocs/core/class/CMailFile.class.php
2020-02-20 00:21:25 +01:00
Laurent Destailleur
c14daa2790
Can set main language and sublanguages of a website
2020-02-19 18:32:04 +01:00
Laurent Destailleur
db1e324ba5
Fix trans
2020-02-19 13:58:04 +01:00
Laurent Destailleur
f109864670
NEW Add a profil to import contact categories
...
Load roles of contact only when required
2020-02-19 13:22:24 +01:00
John Botella
6acf10c0d4
extend retained warranty to be available for all invoices
2020-02-19 11:54:55 +01:00
Laurent Destailleur
9883c0b688
Merge pull request #12677 from OPEN-DSI/new-project-weighted-amount
...
NEW add weighted amount on project/opportunity
2020-02-19 00:03:03 +01:00
Laurent Destailleur
2ac064059a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/projet/element.php
2020-02-18 22:40:43 +01:00
Laurent Destailleur
9ce0e6869e
Fix trans
2020-02-18 11:55:39 +01:00
David Beniamine
1cd566f1ae
Merge tag 'develop' of https://github.com/Dolibarr/dolibarr into takepos-sort-product
2020-02-18 11:09:45 +01:00
Laurent Destailleur
1d760f0e42
Add MO in project overwiew
2020-02-17 21:24:59 +01:00
Laurent Destailleur
1904ae0e82
FIX Type of contact for event does not exists and not supported
...
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-02-17 12:25:51 +01:00
Laurent Destailleur
a02f5cde92
FIX Type of contact for event does not exists and not supported
...
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER
2020-02-17 12:21:07 +01:00
Laurent Destailleur
f4f3efec62
Fight against $_POST
2020-02-16 19:33:58 +01:00
Laurent Destailleur
ed778bd28f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/ticket/view.php
2020-02-15 18:13:35 +01:00
Laurent Destailleur
2b3cc0d048
Fix add both public id and ref in topic
2020-02-15 18:00:09 +01:00
Laurent Destailleur
58a2a71605
Merge pull request #13067 from maboelfotoh/custom
...
NEW add Opening Balance column to balance.php
2020-02-14 19:25:18 +01:00
Muhammad Aboelfotoh
ce6cf04028
Add new view for balance.php that additionally shows opening balance
2020-02-13 13:53:07 +00:00
Laurent Destailleur
a4f13194c3
Merge pull request #12503 from atm-greg/New_Supplier_Packaging
...
NEW Experiment supplier packaging with option PRODUCT_USE_SUPPLIER_PACKAGING: Using price according to the minimum quantity
2020-02-13 10:50:56 +01:00
Laurent Destailleur
4762bafb02
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/subscription/list.php
htdocs/mrp/class/mo.class.php
2020-02-12 22:58:37 +01:00
Laurent Destailleur
139dfc3022
Debug MRP module
2020-02-12 22:45:27 +01:00
Laurent Destailleur
0d366c45e5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-12 21:43:44 +01:00
Laurent Destailleur
0f12003782
Trans
2020-02-12 21:20:55 +01:00
Laurent Destailleur
8518e0752f
NEW Can edit option PDF_USE_ALSO_LANGUAGE_CODE from PDF setup page
2020-02-11 16:01:32 +01:00
Laurent Destailleur
05f0242198
NEW The info_admin() can show text after click on other text
2020-02-11 10:38:09 +01:00
Laurent Destailleur
8604ff99ed
Merge pull request #13068 from andreubisquerra/develop
...
Add time tags to Receipt Printers module
2020-02-10 15:37:37 +01:00
Laurent Destailleur
3baf0e66b9
Trans
2020-02-10 01:11:52 +01:00
andreubisquerra
bc8d9e6c7e
Add langs tags
2020-02-09 14:04:22 +01:00
Laurent Destailleur
1ee959a11f
Generic graph
2020-02-08 17:46:41 +01:00
andreubisquerra
c52e26991a
Add receipt tags to lang
2020-02-07 18:32:08 +01:00
Laurent Destailleur
cd58822d98
Can edit a table of resolution code for tickets
2020-02-07 12:48:41 +01:00
Laurent Destailleur
9c73bb1aef
NEW Can create an deposit from order using a percentage of qty.
2020-02-06 14:15:41 +01:00
atm-greg
f8ffdea5ae
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_Supplier_Packaging
2020-02-06 09:59:42 +01:00
Laurent Destailleur
4f3cc87077
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
2020-02-05 19:23:38 +01:00
Laurent Destailleur
30fa8940a9
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
2020-02-05 19:23:00 +01:00
Laurent Destailleur
f3e27695e2
FIX Avoid deletion of bank record if in accounting
2020-02-05 16:35:50 +01:00
Laurent Destailleur
44ed5980f5
FIX Avoid deletion of bank record if in accounting
2020-02-05 16:35:09 +01:00
Laurent Destailleur
1875b6a49b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/security2.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
2020-02-05 14:53:47 +01:00
AdrianDominik
4695172028
Merge remote-tracking branch 'upstream/11.0' into 11.0
2020-02-04 11:40:37 +01:00
Alexandre SPANGARO
d6d3fff9dc
Merge branch 'develop' into 10.0_intracommreport
2020-02-03 21:15:07 +01:00
andreubisquerra
5a248f31a6
Add langs
2020-02-03 19:34:39 +01:00
Laurent Destailleur
36461afea9
FIX Creation of Stripe card from backoffice must return a clean message
2020-02-03 14:55:02 +01:00
Laurent Destailleur
7b661e707e
FIX Creation of Stripe card from backoffice must return a clean message
2020-02-03 14:54:35 +01:00
AdrianDominik
ad2e10a679
FIX : #12908 User login with credentials from self-subscription form fails
2020-02-03 09:54:34 +01:00
Laurent Destailleur
ff6bcbdcf8
Fix trans
2020-02-03 03:10:03 +01:00
Laurent Destailleur
3f73339818
Fix trans
2020-02-03 03:01:23 +01:00
Laurent Destailleur
21e4717721
Merge pull request #12983 from atm-quentin/NEW_monthly_view
...
NEW monthly view to enter time
2020-02-02 20:05:18 +01:00
Laurent Destailleur
f752551914
WIP Generic stats page
2020-01-31 14:53:47 +01:00
atm-quentin
a001913751
Debut modification saisie par mois
...
NEW hook and data id
NEW visu FROM day TO day in permonth view
FIX
2020-01-31 11:21:49 +01:00
Laurent Destailleur
51c6540a56
WIP Advanced search
2020-01-30 23:28:50 +01:00
Laurent Destailleur
d0c37a3c61
css
2020-01-30 12:24:04 +01:00
Laurent Destailleur
2791f10e18
Merge pull request #12934 from aspangaro/12.0_a10
...
NEW: Accountancy - General ledger - Add an option to search not reconciled line
2020-01-30 01:48:21 +01:00
Laurent Destailleur
1e879126cd
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/exports/class/export.class.php
2020-01-29 19:28:06 +01:00
Laurent Destailleur
633ba666aa
Add info of email reference syntax to help debug.
2020-01-29 19:26:04 +01:00
Laurent Destailleur
60f772d285
FIX Pending amount to pay must be zero if invoice close for anticipated
...
payment.
2020-01-29 17:56:09 +01:00
Laurent Destailleur
7c34d97e2d
Fix messages for SPF
2020-01-29 13:10:16 +01:00
Alexandre SPANGARO
074e55fca5
NEW: Accountancy - General ledger - Add an option to search not reconciled line
2020-01-28 22:56:26 +01:00
Laurent Destailleur
80707d6a5e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-28 17:24:26 +01:00
Laurent Destailleur
40636adb56
Enhance #12865
...
No need of option. A new parameter on url is enough.
2020-01-28 03:34:56 +01:00
Laurent Destailleur
a02a2a6def
Sync transifex
2020-01-27 16:07:53 +01:00
Alexandre SPANGARO
e70e74de94
NEW: Accountancy - General ledger - Add an option to search not lettering line
2020-01-27 05:21:56 +01:00
Laurent Destailleur
0271a43e80
Merge branch 'develop' into master
2020-01-27 02:17:14 +01:00
Laurent Destailleur
539348bbbb
Responsive TakePOS with Bar.
2020-01-27 01:31:39 +01:00
Laurent Destailleur
30a5ab479f
Can choose text to show when there is no data
2020-01-25 22:43:24 +01:00
Laurent Destailleur
0f2141269a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-01-25 14:43:57 +01:00
Laurent Destailleur
c494e3029b
Trans
2020-01-24 20:14:01 +01:00
Laurent Destailleur
08d8670bb3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/class/product.class.php
2020-01-24 20:12:27 +01:00
Laurent Destailleur
de4183ea65
Update logos
2020-01-24 17:30:46 +01:00
Laurent Destailleur
17f28189f9
Virtual stock must include Manufacturing Orders
2020-01-24 14:51:45 +01:00
Laurent Destailleur
f06f15de2e
Merge pull request #12861 from TobiasSekan/ShowHolidaysInAgenda
...
New: Show holidays in the agenda view (month, week, day)
2020-01-22 14:13:55 +01:00
Laurent Destailleur
d3411a79ef
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-22 14:11:44 +01:00
Laurent Destailleur
0456994f0d
Responsive
2020-01-22 13:34:21 +01:00
Laurent Destailleur
e3a21c55d1
Fix label
2020-01-21 21:37:10 +01:00
Laurent Destailleur
60a6dc5545
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-21 13:26:46 +01:00
Laurent Destailleur
6d50cc1899
Update demo profiles
2020-01-21 13:25:38 +01:00
Laurent Destailleur
2d07a08e55
Fix init of specimen
2020-01-21 00:22:57 +01:00
Laurent Destailleur
80483fc085
Fix init of specimen
2020-01-21 00:20:03 +01:00
Laurent Destailleur
92856788a3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-20 18:39:46 +01:00
Laurent Destailleur
206cfcd7fe
Clean code for inventory
2020-01-20 02:07:47 +01:00
Laurent Destailleur
65fef47bdb
Enable new pdf templates as stable
2020-01-20 01:05:30 +01:00
Laurent Destailleur
e679e05f57
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-19 19:49:04 +01:00
andreubisquerra
98789c908e
Colorful theme for TakePOS
2020-01-19 19:16:45 +01:00
Laurent Destailleur
e803e06c0d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/tools/listevents.php
htdocs/commande/class/commande.class.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/exports/export.php
2020-01-19 19:01:46 +01:00
Laurent Destailleur
8c8d492a48
FIX Protection to avoid blocking situation with negative lines
2020-01-19 15:19:07 +01:00
Laurent Destailleur
24d439845b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
2020-01-18 20:20:25 +01:00
Laurent Destailleur
b48c9a5998
Update website templates
2020-01-17 14:09:29 +01:00
VESSILLER
60d4f63205
FIX send expense report mail in HTML format
2020-01-17 13:56:01 +01:00
Laurent Destailleur
ab8078689f
Trans
2020-01-17 13:31:40 +01:00
Laurent Destailleur
48c077af56
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-17 11:39:46 +01:00
Laurent Destailleur
2099e05f22
Fix translation
2020-01-17 11:39:22 +01:00
Laurent Destailleur
9c1e409feb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-17 11:35:16 +01:00
Laurent Destailleur
906110dc1d
Fix backup. Recommended compression is gzip.
2020-01-17 11:34:31 +01:00
Laurent Destailleur
c556f60c89
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-16 18:13:35 +01:00
Laurent Destailleur
6318f21a8f
Trans
2020-01-16 15:07:18 +01:00
Tobias Sekan
b79c6fc848
Update German language
2020-01-16 10:38:20 +01:00
Laurent Destailleur
ad7278e6a5
FIX Label of DEPOSIT on screen
...
Fix look and feel v11
2020-01-16 02:48:24 +01:00
Laurent Destailleur
8f73bce878
Add warning if zip lib missing
2020-01-16 01:11:39 +01:00
Laurent Destailleur
2c40e4be94
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-15 20:13:45 +01:00
Laurent Destailleur
3bd95c205d
Tooltip to understand the new dictionary of holidays
2020-01-15 14:54:17 +01:00
Laurent Destailleur
141ca20269
Trans
2020-01-15 14:44:53 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category
2020-01-15 14:21:06 +01:00
Laurent Destailleur
ce2b0b9cad
Trans
2020-01-15 13:51:06 +01:00
Laurent Destailleur
18324962c5
Better help
2020-01-15 13:41:07 +01:00
Laurent Destailleur
5772dce460
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2020-01-15 12:09:21 +01:00
Laurent Destailleur
14d59f43af
Trans
2020-01-15 11:33:02 +01:00
TuxGasy
dcba3d5c7c
New: Professional identifiers for Roumania
2020-01-13 23:00:06 +01:00
Laurent Destailleur
ffd12cd44e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-13 13:44:44 +01:00
Laurent Destailleur
ed2c75a2f8
Merge pull request #12776 from aspangaro/12.0_a4
...
NEW Add social networks of the company
2020-01-13 13:38:16 +01:00
Laurent Destailleur
5740d17450
Better help
2020-01-13 12:10:20 +01:00
Laurent Destailleur
a6bae97826
Sync from transifex
2020-01-12 21:28:09 +01:00
Laurent Destailleur
e03bff87e5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-10 19:51:26 +01:00
Laurent Destailleur
89ab80e598
Fix typo
2020-01-10 14:41:58 +01:00
Laurent Destailleur
b47db086cb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/inventory/class/inventory.class.php
htdocs/product/inventory/list.php
2020-01-10 14:30:42 +01:00
Laurent Destailleur
675ce3b32f
Fix sql error on update of subledger account on a various payment
...
Fix warning message that was not accurate
2020-01-10 02:20:08 +01:00
Laurent Destailleur
f48c7d2ecf
Fix modulebuilder
2020-01-09 22:31:23 +01:00
Laurent Destailleur
f9262b0dcf
Transifex sync
2020-01-09 22:30:00 +01:00
Laurent Destailleur
0e58edd896
Fix modulebuilder
2020-01-09 22:27:24 +01:00
Laurent Destailleur
8b696970a7
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-09 17:17:28 +01:00
Laurent Destailleur
cef38016bb
Trans
2020-01-09 17:16:30 +01:00
Laurent Destailleur
cee4fe79a3
Update doc
2020-01-09 12:50:04 +01:00
Laurent Destailleur
124f41f863
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-09 09:10:11 +01:00
Laurent Destailleur
0802df78b5
Debug MRP
2020-01-08 17:56:02 +01:00
Laurent Destailleur
97f62c68f2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-08 13:38:03 +01:00
Laurent Destailleur
7ef3ee56bd
Fix MRP
2020-01-07 20:28:21 +01:00
Laurent Destailleur
e3c56cea5f
Fix missing lang
2020-01-07 14:19:41 +01:00
Laurent Destailleur
57bbac2015
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-06 14:09:46 +01:00
Laurent Destailleur
804f7f3e1e
Fix modulebuilder templates
2020-01-06 14:03:24 +01:00
Laurent Destailleur
6dcba0f053
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-04 14:27:55 +01:00
Laurent Destailleur
38de69f5a9
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/list.php
htdocs/compta/bank/releve.php
htdocs/compta/salaries/card.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/boxes.lang
htdocs/langs/en_US/main.lang
htdocs/product/class/product.class.php
htdocs/product/reassort.php
htdocs/product/stock/product.php
htdocs/projet/element.php
2020-01-04 14:20:25 +01:00
Laurent Destailleur
b9e0f8999f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2020-01-04 14:03:21 +01:00
Laurent Destailleur
15ad41ee6d
MRP
2020-01-03 15:01:14 +01:00
Alexandre SPANGARO
93d87d581b
FIX typo on language key
2020-01-03 14:56:49 +01:00
Laurent Destailleur
68d7195964
MRP
2020-01-02 22:09:08 +01:00
Laurent Destailleur
84d0ae7ac5
Trans
2020-01-01 17:31:48 +01:00
Laurent Destailleur
90a78267c5
Trans
2020-01-01 17:31:29 +01:00
Laurent Destailleur
eae0800021
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-01 11:24:10 +01:00
Manu Bryk
14d69c5a2c
New Ref more visible when create a ticket
...
When customers call support to trace a ticket, they don't have easily ref of the ticket. Add Ref to the subject of mail for customers and for TICKET_NOTIFICATION_EMAIL_TO. Add ref also to the notification message when customers create a new ticket.
2019-12-31 17:24:37 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-31 13:57:40 +01:00
Alexandre SPANGARO
c664a1e42d
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2019-12-31 08:34:37 +01:00
Laurent Destailleur
fc49825eaa
Merge pull request #12659 from andreubisquerra/master
...
NEW: Takepos supplements
2019-12-30 22:07:19 +01:00
Alexandre SPANGARO
9879a43cf4
NEW Add social networks of the company
2019-12-30 21:17:41 +01:00
Alexandre SPANGARO
a804208b32
Fix missing language key
2019-12-27 20:54:47 +01:00
Alexandre SPANGARO
9a7307eea8
FIX Missing language key for MAIN_MAXTABS_IN_CARD
2019-12-26 12:01:09 +01:00
Laurent Destailleur
07c1a5717e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/facture_situation.php
htdocs/core/class/html.formother.class.php
2019-12-23 14:16:34 +01:00
Laurent Destailleur
9a08a6bf6d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/categories/traduction.php
htdocs/compta/facture/class/facture.class.php
htdocs/contact/card.php
htdocs/core/modules/modSociete.class.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/langs/en_US/products.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
htdocs/margin/tabs/thirdpartyMargins.php
2019-12-23 14:13:26 +01:00
Laurent Destailleur
2df9df2db0
Debug v11
2019-12-23 12:24:27 +01:00
Laurent Destailleur
4312a4b016
Typo
2019-12-22 16:06:32 +01:00
Laurent Destailleur
22b7b69c47
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-22 16:01:32 +01:00
Laurent Destailleur
a739a4dcc3
Fix zh_TW
2019-12-22 13:47:47 +01:00
Laurent Destailleur
05a7e62bf4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-22 12:56:25 +01:00
Laurent Destailleur
f9c3b25dbd
Sync transifex
2019-12-22 12:55:38 +01:00
Laurent Destailleur
e2451bcd26
Update images
...
Fix value of delay for warning on project not closed
2019-12-21 17:11:21 +01:00
Laurent Destailleur
ad039ff968
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/repair.php
2019-12-21 14:03:45 +01:00
Laurent Destailleur
c0ef3b46ad
Work on MRP module
2019-12-20 15:31:05 +01:00
Laurent Destailleur
2ad483413e
Better place to force the default warehouse
2019-12-19 12:05:34 +01:00
Laurent Destailleur
d9a1e1b348
Fix several non dolibarr behaviour on input of salary payments
2019-12-19 10:01:11 +01:00
Laurent Destailleur
92facbc892
Merge pull request #12726 from atm-gauthier/10.0_fix_units_trad
...
FIX : units traductions for selectUnits() function
2019-12-18 12:21:33 +01:00
Alexandre SPANGARO
3fb72c349f
Fix language traduction on import/export tools
2019-12-18 03:25:19 +01:00
Laurent Destailleur
7b1bf32cd9
Update products.lang
2019-12-17 12:19:32 +01:00
gauthier
a672673319
FIX : units traductions for selectUnits() function
2019-12-17 11:25:25 +01:00
Laurent Destailleur
5c8733a84b
More complete message
2019-12-16 19:30:18 +01:00
Laurent Destailleur
65abe7532c
Fix error message not reported when deleting record in ledger.
2019-12-16 19:05:32 +01:00
Laurent Destailleur
98cc2c2886
Add tooltip
2019-12-16 14:29:47 +01:00
Laurent Destailleur
fdf4d86d81
Debug code
2019-12-16 12:38:51 +01:00
Laurent Destailleur
65bf2fa285
Merge pull request #12689 from code-chicken/develop
...
Fix: calculation of virtual stock
2019-12-14 13:40:02 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-13 14:36:00 +01:00
VESSILLER
0396b348f7
NEW add weighted amount on project/opportunity
2019-12-10 09:32:37 +01:00
Laurent Destailleur
ae6d536d1d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/dolibarr_export.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
2019-12-09 13:32:56 +01:00
Laurent Destailleur
94bab15528
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
2019-12-09 13:27:30 +01:00
Laurent Destailleur
2b5866aca2
WIP Complete module MRP
2019-12-08 23:45:06 +01:00
andreubisquerra
acbd8efa7d
NEW: Takepos supplements
2019-12-08 23:16:49 +01:00
Rüdiger Hahn
d41675b028
Fix translations
2019-12-08 18:15:13 +01:00
Laurent Destailleur
93d66d8213
Debug v11
2019-12-06 08:50:26 +01:00
Frédéric FRANCE
d9bfa62367
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-05 21:47:42 +01:00
Laurent Destailleur
cdb0453661
Help
2019-12-05 14:17:40 +01:00
Laurent Destailleur
e6b4d2f665
Debug sumup
2019-12-04 18:06:05 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-03 17:56:43 +01:00
Florian Mortgat
4846885eea
NEW 9.0: enable user to use the mysqldump '--quick' option
...
(useful if the server has low RAM or large tables)
2019-12-02 16:54:05 +01:00
Laurent Destailleur
c692650430
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-02 15:23:40 +01:00
Laurent Destailleur
66571df449
Fix remove a link that is private
2019-12-02 15:19:14 +01:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-01 16:10:37 +01:00
Laurent Destailleur
a6408ce9b6
Typo
2019-12-01 13:05:22 +01:00
Laurent Destailleur
eb69538d17
Fix if we insert a product already the product to produce
2019-11-29 23:51:46 +01:00
Laurent Destailleur
d374ce99a1
Trans
2019-11-28 13:20:09 +01:00
Cédric
45bf3e4df9
Merge branch 'develop' into patch-3
2019-11-28 13:11:52 +01:00
Frédéric FRANCE
b2912e688b
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-27 22:54:05 +01:00
Laurent Destailleur
cb352407eb
Add submit
2019-11-26 12:46:40 +01:00
Laurent Destailleur
4ef6c9cc13
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formticket.class.php
htdocs/langs/en_US/ticket.lang
2019-11-26 11:54:42 +01:00
Laurent Destailleur
9d2a5e6c42
Trans
2019-11-26 09:08:32 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-26 08:10:40 +01:00
Alexandre SPANGARO
60f19d134c
Fix Ticket - Align language type with datas for translation
2019-11-26 03:58:01 +01:00
Laurent Destailleur
a8c2aa094d
More examples
2019-11-25 20:30:05 +01:00
Laurent Destailleur
61f414488a
Fix translation
2019-11-24 18:34:07 +01:00
Cédric
950a32a433
Checkbox label delete child product FR
2019-11-23 18:11:20 +01:00
Cédric
b959e59554
Checkbox label delete child product EN
2019-11-23 18:09:17 +01:00
atm-greg
ce15af0980
manage packaging on supplier prices
2019-11-23 15:52:34 +01:00
Laurent Destailleur
32f590f274
Merge pull request #12485 from aspangaro/12.0_a2
...
NEW Add shipment widget
2019-11-22 14:39:56 +01:00
Laurent Destailleur
383f095063
Fix trans
2019-11-22 09:45:14 +01:00
Alexandre SPANGARO
2f064567ef
NEW Add shipment widget
2019-11-21 07:50:44 +01:00
Frédéric FRANCE
d182eee4bf
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-19 23:26:00 +01:00
Laurent Destailleur
5d7a1f1265
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/card.php
htdocs/core/class/extrafields.class.php
htdocs/langs/en_US/stocks.lang
2019-11-19 19:02:14 +01:00
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-18 17:45:52 +01:00
Alexandre SPANGARO
79ee2b8c4d
Missing language key
2019-11-18 11:48:44 +01:00
Laurent Destailleur
662c622432
Debug MRP
2019-11-17 00:37:08 +01:00
Frédéric FRANCE
6784ea9fae
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-16 09:21:57 +01:00
Laurent Destailleur
4fc7b8c3b1
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/extrafields_list_search_title.tpl.php
2019-11-14 12:49:42 +01:00
Laurent Destailleur
a29adc94f3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/comm/card.php
htdocs/langs/en_US/admin.lang
2019-11-14 12:48:33 +01:00
Laurent Destailleur
52787b56b2
Fix when limit = 0
...
Look and feel v11
2019-11-14 11:00:49 +01:00
Frédéric FRANCE
05ab4f79ef
categories for actioncomm
2019-11-13 18:44:11 +01:00
Alexandre SPANGARO
85e2546019
Missing language key
2019-11-13 15:25:23 +01:00
Alexandre SPANGARO
0497c399d7
Missing language key
2019-11-13 14:59:07 +01:00
Laurent Destailleur
4340f85e3c
Add warning
2019-11-13 01:22:13 +01:00
Laurent Destailleur
56c2dc2614
Reduce need of translations
2019-11-12 22:29:36 +01:00
Laurent Destailleur
2c718af26c
Missing container type 'menu'
...
Fix: Add security if container is not a page
2019-11-12 13:55:46 +01:00
Laurent Destailleur
6afc84fe72
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-12 10:20:55 +01:00
Laurent Destailleur
944a15d06b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-11-12 10:20:16 +01:00
Laurent Destailleur
f8e8d15606
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-11-12 10:19:01 +01:00
Laurent Destailleur
79cc3f189d
Work on BOM
2019-11-11 20:56:28 +01:00
Laurent Destailleur
40d66489ad
Trans
2019-11-11 13:47:17 +01:00
Laurent Destailleur
3054177e79
Fix type of tickets
2019-11-10 12:28:30 +01:00
Laurent Destailleur
880ecda098
Fix name of tables
2019-11-10 12:23:21 +01:00
Laurent Destailleur
ad2ff551fa
Fix trans
2019-11-08 10:35:34 +01:00
Laurent Destailleur
d1c49c7021
Fix trans
2019-11-08 10:24:03 +01:00
Laurent Destailleur
9607f61df5
Merge pull request #12349 from frederic34/patch-13
...
Update agenda.lang
2019-11-07 11:29:59 +01:00
Laurent Destailleur
883fcd7a72
Update agenda.lang
2019-11-07 11:29:45 +01:00
Laurent Destailleur
7144740dfe
Merge pull request #12360 from grandoc/new_branch_06_11_2019
...
fix error message
2019-11-07 11:24:15 +01:00
Laurent Destailleur
74f2983ee1
Debug modulebuilder
2019-11-06 19:38:51 +01:00
Philippe GRAND
1b7fe9a427
fix error message
2019-11-06 10:40:21 +01:00
Frédéric FRANCE
df77370a63
Update agenda.lang
2019-11-05 22:01:06 +01:00
Frédéric FRANCE
7d24610d4c
Update agenda.lang
2019-11-05 21:57:11 +01:00
Laurent Destailleur
0ef249ea52
Debug module BOM
2019-11-05 18:06:33 +01:00
Laurent Destailleur
1aef1c60dd
Merge pull request #11867 from frederic34/socialnetworks
...
NEW add socialnetworks dictionary
2019-11-04 21:10:22 +01:00
Laurent Destailleur
17ea978cea
Merge pull request #12306 from frederic34/escpos
...
Escpos
2019-11-04 20:40:12 +01:00
Laurent Destailleur
dbb90914bc
Better Trans
2019-11-04 19:53:27 +01:00
Frédéric FRANCE
6ad983bb7b
Merge remote-tracking branch 'upstream/develop' into escpos
2019-11-04 18:52:29 +01:00
Laurent Destailleur
a0db0fccbe
Debug BOM
2019-11-04 15:56:45 +01:00
Laurent Destailleur
8aa2fd04ad
NEW The integrity checker now show the expected size of files
2019-11-04 13:23:48 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-11-03 21:48:24 +01:00
Frédéric FRANCE
d797ea590e
rework an experimental module
2019-11-03 00:50:58 +01:00
Laurent Destailleur
2ee002fc80
Fix trans
2019-11-02 17:44:58 +01:00
Laurent Destailleur
496f93911f
Merge pull request #11821 from Tim-Otte/develop
...
NEW Extrafields support in product supplier prices
2019-11-02 16:19:13 +01:00
Laurent Destailleur
bd4d7b3505
Merge pull request #12268 from atm-john/develop_fix_fatal_hookmanager
...
FIX fatal error missing global
2019-11-02 13:07:34 +01:00
Laurent Destailleur
68c971a2b5
All properties 'type_libelle' were renamed into 'type_label'.
2019-11-02 11:12:57 +01:00
Laurent Destailleur
a95a10b8f0
Update doc
2019-11-01 18:45:44 +01:00
Laurent Destailleur
012c5ef0c4
Can use substitution variables into filter of fields link
2019-11-01 18:35:48 +01:00
Laurent Destailleur
2af23aa658
Enhance modulebuilder
2019-11-01 17:54:17 +01:00
Laurent Destailleur
135e65c4aa
Look and feel v11
...
Enhance the progress bar of tasks
2019-11-01 15:53:57 +01:00
Laurent Destailleur
fb95d14aeb
Work on MO
2019-10-31 23:02:51 +01:00
Laurent Destailleur
716c2bb531
Work on MO
2019-10-31 22:46:34 +01:00
Laurent Destailleur
f98df3c807
NEW Can edit link to the translation page in website module
2019-10-31 21:09:33 +01:00
Frédéric FRANCE
f7747ed00a
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-30 20:06:43 +01:00
John Botella
f626f249cf
Fix missing lang
2019-10-30 15:40:06 +01:00
Laurent Destailleur
6a01132fdb
Merge pull request #12210 from grandoc/new_branch_24_10_2019
...
add some comment
2019-10-30 03:17:21 +01:00
Laurent Destailleur
beb85ee3a8
Work on MO
2019-10-30 00:56:57 +01:00
Laurent Destailleur
66337ec234
NEW Add widgets for BOMs and MOs
2019-10-30 00:36:47 +01:00
Frédéric FRANCE
30d416f8c0
Update agenda.lang
2019-10-28 20:16:27 +01:00
Frédéric FRANCE
1ba9612f12
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-27 17:03:50 +01:00
Laurent Destailleur
7f1b67f0e4
Add warehouse for production on MO
2019-10-27 16:28:03 +01:00
Laurent Destailleur
afa3ed499f
Can export BOMs
2019-10-27 15:56:20 +01:00
Laurent Destailleur
eb112d4012
Add qty frozen and disable stock change flag on BOM
2019-10-27 01:49:31 +02:00
Laurent Destailleur
f060ef1018
FIX Clean decimal data for module builder
2019-10-27 00:01:16 +02:00
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-25 08:12:54 +02:00
Philippe GRAND
dde9dcbee3
missing translation
2019-10-24 16:29:27 +02:00
Laurent Destailleur
88e848e346
FIX Extrafields missing in export of expense report
2019-10-24 16:00:10 +02:00
Laurent Destailleur
15609e319f
FIX Extrafields missing in export of expense report
2019-10-24 15:57:34 +02:00
Laurent Destailleur
64ac113761
Show dictionaries of a module in module builder
2019-10-24 14:56:43 +02:00
Laurent Destailleur
2201b11fd3
NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_PROPOSAL
...
NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL
2019-10-24 13:41:04 +02:00
Laurent Destailleur
6fa3b53cf7
NEW Module builder can generate CSS of JS file.
2019-10-24 11:41:36 +02:00
Laurent Destailleur
da00591bba
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/product.lib.php
htdocs/expedition/card.php
htdocs/product/list.php
2019-10-23 04:04:32 +02:00
Laurent Destailleur
f23804a091
FIX #12152
2019-10-23 03:00:19 +02:00
Laurent Destailleur
0180014d4d
Fix link in popup of shipment
2019-10-23 01:35:32 +02:00
Laurent Destailleur
fea12076ee
FIX #12152
2019-10-22 20:24:52 +02:00
Laurent Destailleur
6079a4d159
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/langs/en_US/main.lang
2019-10-22 15:25:31 +02:00
Tim Otte
ceb3482204
Requested changes implemented
2019-10-22 11:36:28 +02:00
Laurent Destailleur
c5490e22d1
Fiw trans
2019-10-22 02:58:55 +02:00
Laurent Destailleur
8e474701c1
Fix missing token
2019-10-21 15:49:08 +02:00
Laurent Destailleur
b21bca17de
Add button Save and stay when editing property of web site
2019-10-21 00:55:52 +02:00
Frédéric FRANCE
9ec7836387
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-20 16:37:18 +02:00
Laurent Destailleur
5a4960f7ae
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/takepos/takepos.php
2019-10-20 15:30:28 +02:00
Laurent Destailleur
bf1b2242ea
Fix no focus if we are on edit mode directly
2019-10-20 13:22:29 +02:00
Frédéric FRANCE
f9c0e63f16
Update main.lang
2019-10-17 22:59:52 +02:00
Frédéric FRANCE
aeafdae34c
Update main.lang
2019-10-17 22:58:47 +02:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-17 20:24:04 +02:00
Laurent Destailleur
87ec1de78e
Start to work on solution to sort permissions by module
2019-10-17 18:43:07 +02:00
Laurent Destailleur
40fdcfac7e
Merge branch 'develop' into 10.0_closure2
2019-10-17 18:16:57 +02:00
Laurent Destailleur
1a419a6eb6
Fix translation
2019-10-17 15:15:16 +02:00
Laurent Destailleur
084ab53b4b
Fix translation
2019-10-17 12:14:38 +02:00
Gildas
7ccc07c05f
Fix translation typo in stocks
2019-10-17 12:11:01 +02:00
Laurent Destailleur
7d965e8b92
Merge pull request #12139 from frederic34/patch-17
...
translation for ORDER_SUPPLIER_DELETEInDolibarr
2019-10-16 13:22:46 +02:00
Laurent Destailleur
ffc4820970
Fix counter of BOM
2019-10-16 02:05:23 +02:00
Laurent Destailleur
b0355dd149
Module BOM have now status DRAFT, VALIDATED, DISABLED
2019-10-16 01:20:58 +02:00
Laurent Destailleur
12f1962085
Better error message when module file is corrupted
2019-10-16 00:40:42 +02:00
Frédéric FRANCE
d1d9b1ed85
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-15 09:39:57 +02:00
Frédéric FRANCE
00bac9e989
Update interface_50_modAgenda_ActionsAuto.class.php
...
Update agenda.lang
Update agenda.lang
Update interface_50_modAgenda_ActionsAuto.class.php
2019-10-15 09:38:24 +02:00
Laurent Destailleur
fb3d20107c
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/exports/export.php
htdocs/filefunc.inc.php
2019-10-15 03:51:57 +02:00
Frédéric FRANCE
2351750d2b
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-14 19:02:46 +02:00
Laurent Destailleur
4fd12e22cb
Fix trans export
2019-10-14 12:27:44 +02:00
Laurent Destailleur
a33fb47777
Work on MO module
2019-10-14 12:10:14 +02:00
Laurent Destailleur
7973b03201
NEW Add estimated duration on the BOM module
2019-10-14 11:38:36 +02:00
Frédéric FRANCE
d9ba09bec1
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-12 19:02:24 +02:00
Laurent Destailleur
9871dd8770
Debug variants
2019-10-12 15:27:06 +02:00
Laurent Destailleur
dccfdad9dd
Work on inventory feature
2019-10-12 11:32:47 +02:00
Laurent Destailleur
dfaf2ae34b
Trans
2019-10-11 19:20:52 +02:00
Frédéric FRANCE
367ef4acaf
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-11 16:44:25 +02:00
Laurent Destailleur
78bfc8997d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/link.class.php
2019-10-11 16:14:29 +02:00
Laurent Destailleur
85a4bac9e0
Better translation
2019-10-11 15:22:12 +02:00
Laurent Destailleur
60395f2a9c
NEW Look and feel v11: Some setup pages are by default on edit mode
2019-10-11 14:09:26 +02:00
Laurent Destailleur
4db57f53f9
typo
2019-10-11 11:39:33 +02:00
Laurent Destailleur
de107fb02e
NEW Can set a squarred icon on your company setup
2019-10-11 11:27:05 +02:00
Frédéric FRANCE
03bbfc6ad9
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-10 23:24:50 +02:00
Laurent Destailleur
aebae5ff83
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/margins.lang
htdocs/user/class/user.class.php
2019-10-10 10:37:17 +02:00
Frédéric FRANCE
02b706f9c0
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-09 13:40:46 +02:00
Laurent Destailleur
a26281dab3
Merge pull request #12066 from fuhraih/feature1
...
NEW #4301
2019-10-09 11:52:45 +02:00
Laurent Destailleur
f83cc0bcfd
Picto of user umage larger
2019-10-08 21:02:59 +02:00
Laurent Destailleur
6de31f2c54
Better translation
2019-10-08 19:35:50 +02:00
Laurent Destailleur
8921a103c1
Trans
2019-10-08 19:25:54 +02:00
Frédéric FRANCE
f253315c8d
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-08 18:30:58 +02:00
Laurent Destailleur
b13d5aafb3
Trans
2019-10-08 15:45:37 +02:00
Laurent Destailleur
328abc4048
Clean code
2019-10-08 15:43:44 +02:00
fuhraih
eb20341328
Update companies.lang
2019-10-08 15:42:59 +02:00
Laurent Destailleur
37795b1955
Trans
2019-10-08 15:40:07 +02:00
Laurent Destailleur
ef91e0bff3
Trans
2019-10-08 15:35:36 +02:00
Frédéric FRANCE
b78187c1eb
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-08 00:07:27 +02:00
Laurent Destailleur
16eeeecb9a
Trans
2019-10-07 17:08:08 +02:00
Laurent Destailleur
c83f40fc7e
Debug contact by default
2019-10-07 15:42:37 +02:00
Laurent Destailleur
c6c498fd67
Merge pull request #11829 from atm-florian/dev_contactdefault
...
NEW : Address/Contact by default on third parties
2019-10-07 15:27:58 +02:00
Laurent Destailleur
a9c844460b
Debug use of widget on Accounting home page
2019-10-07 14:39:29 +02:00
Laurent Destailleur
035da6a711
Merge pull request #11951 from aspangaro/11.0_accountancy_portal
...
NEW Accountancy - Add an option to hide FAQ on index and add specific widget in this area
2019-10-07 14:24:22 +02:00
Laurent Destailleur
00df21cf17
Trans
2019-10-07 13:48:09 +02:00
Laurent Destailleur
2bb55200f7
Clean user card
2019-10-07 13:46:13 +02:00
Laurent Destailleur
76aef85ee4
Merge pull request #12015 from atm-maxime/new_validators
...
NEW expense request and holiday validator fields
2019-10-07 13:31:20 +02:00
Laurent Destailleur
f4b752ee81
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/core/modules/modProduct.class.php
htdocs/expedition/card.php
2019-10-07 12:33:13 +02:00
Laurent Destailleur
b9ac8295d4
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-10-07 12:28:06 +02:00
Laurent Destailleur
55508e25ec
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-07 12:27:06 +02:00
Frédéric FRANCE
52da21912b
Update agenda.lang
2019-10-06 13:21:04 +02:00
Frédéric FRANCE
21dcc549fa
translation for holidays actioncomm
2019-10-06 10:09:06 +02:00
Maxime Kohlhaas
2068692f40
Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_validators
2019-10-05 22:25:06 +02:00
Maxime Kohlhaas
848b9cc57a
Translations
2019-10-05 22:24:59 +02:00
Frédéric FRANCE
6384e7eb67
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-05 20:02:16 +02:00
Laurent Destailleur
031c5523d4
NEW Add link to the public interface on the ticket card.
2019-10-05 11:52:30 +02:00
florian HENRY
2d3dd9ed3c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-10-04 18:10:16 +02:00
Frédéric FRANCE
0383fdbeee
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-03 18:37:14 +02:00
Laurent Destailleur
ad4aa39ec5
Merge pull request #11986 from atm-john/develop_dropdown_bookmark
...
NEW : dropdown bookmark and search
2019-10-03 18:18:31 +02:00
Laurent Destailleur
74d3850ec8
Merge pull request #12030 from altatof/fckticket
...
NEW : FCKeditor setup for tickets
2019-10-03 17:49:59 +02:00
Frédéric FRANCE
98023353fe
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-03 17:21:31 +02:00
altairis
699a3391c9
FCKeditor setup for tickets
2019-10-03 16:51:05 +02:00
Sebastien Baguet
d11bb9570c
Add French and English translation
2019-10-03 13:44:40 +02:00
John Botella
135621c02b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_dropdown_bookmark
2019-10-03 08:51:22 +02:00
Frédéric FRANCE
3afb4355a8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-02 18:59:18 +02:00
Laurent Destailleur
d8a8c4fbe6
Look and feel v11. Picto are fontawesome.
2019-10-02 18:36:36 +02:00
Alexandre SPANGARO
a6e429ff32
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
2019-10-02 08:49:00 +02:00
Alexandre SPANGARO
4d5547636d
Accountancy FAQ - Move to toggle()
2019-10-02 08:43:35 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 22:03:33 +02:00
florian HENRY
d48f0fa791
resolve conflixt
2019-10-01 18:07:59 +02:00
Frédéric FRANCE
5821caa7fc
work on migration script
2019-10-01 18:02:39 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https
...
Move Gnu.org to https
2019-10-01 14:48:21 +02:00
Frédéric FRANCE
3b9bf2b06a
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 12:25:34 +02:00
John Botella
2edc3ffe4b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_dropdown_bookmark
2019-10-01 08:50:34 +02:00
Alexandre SPANGARO
16c6c9ae75
Merge remote-tracking branch 'upstream/develop' into 11.0_https
2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd
Merge branch 'develop' into 11.0_https
2019-10-01 06:11:43 +02:00
Alexandre SPANGARO
f91513937a
Remove option to hide FAQ
2019-09-30 21:37:20 +02:00
Alexandre SPANGARO
8dea427f58
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
2019-09-30 21:23:27 +02:00
Frédéric FRANCE
31418c2e42
check php-calendar extension
2019-09-30 21:14:25 +02:00
Frédéric FRANCE
b87610adcc
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-30 19:34:35 +02:00
Frédéric FRANCE
fec67aade4
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-30 18:44:34 +02:00
Laurent Destailleur
0e73beaccc
Merge pull request #11987 from andreubisquerra/master
...
Custome receipt tab in TakePOS
2019-09-30 18:03:03 +02:00
Laurent Destailleur
48fc165026
Trans
2019-09-30 17:15:05 +02:00
John Botella
61c8e8ec0c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_dropdown_bookmark
2019-09-30 17:13:54 +02:00
Laurent Destailleur
d65af06d20
Merge pull request #11869 from atm-john/new_ticket_messaging_page
...
New ticket messaging page design
2019-09-30 15:34:35 +02:00
Frédéric FRANCE
258424416e
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-30 07:49:52 +02:00
andreubisquerra
34be514326
Custom receipt tab in TakePOS
2019-09-29 20:56:24 +02:00
ATM john
cd821261e8
Add global search dropdown
2019-09-29 18:56:28 +02:00
Laurent Destailleur
266aace5d1
Trans
2019-09-29 18:55:48 +02:00
Laurent Destailleur
0f2b36bb82
Work on MRP module
2019-09-29 18:39:52 +02:00
Frédéric FRANCE
1b151da776
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-29 11:28:54 +02:00
Alexandre SPANGARO
8e42ac8cd0
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
2019-09-28 22:31:08 +02:00
Laurent Destailleur
a19fd8507e
Trans
2019-09-28 13:47:51 +02:00
Laurent Destailleur
db32ca99c6
Fix translation and sql request
2019-09-28 12:36:09 +02:00
Frédéric FRANCE
cea3669ffa
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-28 00:35:14 +02:00
florian HENRY
885d958e63
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-09-27 20:12:09 +02:00
Laurent Destailleur
c0e7c558a1
Merge pull request #11860 from atm-john/new_box_supplier_orders_awaiting_reception
...
NEW widget box for supplier orders awaiting reception
2019-09-27 15:32:43 +02:00
Laurent Destailleur
a79c4608d6
Merge pull request #11934 from atm-quentin/NEW_stock_categories
...
NEW Categories/Tags are also available on warehouses
2019-09-27 12:41:28 +02:00
Laurent Destailleur
881c90ab74
Merge pull request #11953 from grandoc/new_branch_24_09_2019
...
add missing translation
2019-09-27 11:56:01 +02:00
Frédéric FRANCE
03086026b8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-27 08:06:13 +02:00
Laurent Destailleur
ba1275332d
Fix thousand separator for fr_NC
2019-09-25 13:03:43 +02:00
Frédéric FRANCE
41cb628d05
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-25 08:06:44 +02:00
Laurent Destailleur
961f2b5165
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/viewcat.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/takepos/invoice.php
2019-09-24 14:25:02 +02:00
Laurent Destailleur
7b3e64d67f
NEW Support of Extrafields on Leave requests.
2019-09-24 12:01:18 +02:00
Philippe GRAND
7ec43e8b59
add missing translation
2019-09-24 09:54:57 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
a005408d83
NEW Accountancy - Add an option to hide FAQ on index and add widget in area
2019-09-23 20:42:50 +02:00
Laurent Destailleur
d22a1e2571
Use space
2019-09-23 19:44:05 +02:00
atm-quentin
80d5be56f6
Fix trans
2019-09-19 16:26:53 +02:00
atm-quentin
c09f2d8c4e
NEW stock categories
2019-09-19 16:21:03 +02:00
Laurent Destailleur
ad3d21578c
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-09-18 13:13:02 +02:00
Laurent Destailleur
2da5071642
Fix VAT in New caledonia is now called TGC
2019-09-18 13:12:22 +02:00
Frédéric FRANCE
850b9fd52a
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-17 08:24:31 +02:00
John Botella
010e58d957
Add switch view behavior
2019-09-16 13:56:07 +02:00
Laurent Destailleur
0194f48041
Merge pull request #10795 from altatof/clonecat
...
NEW : copy linked categories on product clone process
2019-09-15 16:34:42 +02:00
Laurent Destailleur
434ab2965a
Merge pull request #11820 from OPEN-DSI/new-resource-add-event-check-busy
...
NEW check if a resource is in use in an event
2019-09-15 15:47:07 +02:00
Frédéric FRANCE
ff77d613fb
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-15 11:24:13 +02:00
Laurent Destailleur
6c078bdcb0
Fix translation
2019-09-15 10:53:41 +02:00
Laurent Destailleur
477c0e2aa4
Merge pull request #11897 from aspangaro/11.0_colorization
...
NEW Bank Add an option for colorize background color of debit or credit movement
2019-09-15 10:40:34 +02:00
Alexandre SPANGARO
21e27389d4
NEW Bank Add an option for colorize background color of debit or credit movement
2019-09-14 20:58:12 +02:00
Frédéric FRANCE
904d0ecaee
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-14 18:42:31 +02:00
Frédéric FRANCE
1e652a41af
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-14 18:41:51 +02:00
Laurent Destailleur
9f6fe0bf5a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/orders.lang
2019-09-14 18:27:58 +02:00
Laurent Destailleur
3caa1bd43c
FIX Debug feature orderstoinvoice for suppliers
2019-09-14 18:21:37 +02:00
Frédéric FRANCE
6444c7378f
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-14 16:40:23 +02:00
Frédéric FRANCE
e5417cccd8
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-14 16:40:00 +02:00
Laurent Destailleur
4d1d689fc8
Merge pull request #11868 from bafbes/abb100077
...
New : Use of posixAccount and posixGroup objectclass for users and groups in LDAP
2019-09-14 16:37:16 +02:00
Frédéric FRANCE
c9c7d60fc0
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-14 16:37:10 +02:00
Laurent Destailleur
4e4172dd1b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/payment/newpayment.php
2019-09-13 18:56:19 +02:00
Frédéric FRANCE
de3a67f5bd
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-09-12 21:52:06 +02:00
ATM john
859904587f
add private support and title buttons
2019-09-12 21:17:48 +02:00
Frédéric FRANCE
6f33874d75
add entity
2019-09-12 21:13:00 +02:00
Laurent Destailleur
a12bd6aec8
better translation
2019-09-12 18:55:07 +02:00
Laurent Destailleur
56a99f6e6d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-12 11:22:13 +02:00
Abbes Bahfir
5183a1ec7a
New : Use of posixAccount and posixGroup objectclass for users and groups in LDAP
2019-09-11 22:45:52 +01:00
Laurent Destailleur
3f3282400a
FIX SQL syntax error and CSRF check on vat reports
2019-09-11 13:57:15 +02:00
ATM john
337194023a
Add purchase orders awaiting reception to workboard
2019-09-10 22:10:20 +02:00
ATM john
9db2e27289
add widget box for supplier orders awaiting reception
2019-09-10 21:47:08 +02:00
florian HENRY
ad92efaee1
add trans
2019-09-09 14:58:29 +02:00
florian HENRY
42cd15400d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-09-09 14:12:34 +02:00
Laurent Destailleur
d2131a0be8
Add filter on usage on project list
2019-09-09 14:08:10 +02:00
florian HENRY
bdb297a380
resolve conflict
2019-09-09 10:15:44 +02:00
Laurent Destailleur
6d38d58000
Trans
2019-09-08 21:31:10 +02:00
Laurent Destailleur
44cb9738d6
Fix trans
2019-09-07 14:35:47 +02:00
Frédéric FRANCE
c6a02312a9
Merge remote-tracking branch 'upstream/develop' into zapier
2019-09-07 14:19:07 +02:00
Laurent Destailleur
30d2f84eb7
Remove a label that is no more used
2019-09-07 10:58:20 +02:00
Laurent Destailleur
a481fac289
Merge pull request #11793 from altatof/supplierorderstatus
...
Differentiate supplier orders status
2019-09-07 10:54:03 +02:00
Laurent Destailleur
89e1cdff61
Debug module datapolicy
2019-09-06 19:41:15 +02:00
Laurent Destailleur
09d6826e62
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/supplier_order.php
htdocs/langs/en_US/admin.lang
2019-09-06 14:27:01 +02:00
Laurent Destailleur
bc0b8dfad0
FIX Consistency in direct debit order lists.
...
FIX Confirmation of deletion
2019-09-06 14:24:33 +02:00
Laurent Destailleur
57a15b88fa
Fix UMR
2019-09-06 14:07:42 +02:00
florian HENRY
dff7be59c8
mostlyDone
2019-09-06 09:22:53 +02:00
Laurent Destailleur
2e8c915b88
Fix more consistent setup
2019-09-06 02:39:08 +02:00
Laurent Destailleur
80daf29d79
Fix conflict between new module reception and old process
...
Fix inventory record does not need status at creation
Conflicts:
htdocs/fourn/commande/card.php
2019-09-06 01:55:22 +02:00
Laurent Destailleur
04adbd8c80
Fix conflict between new module reception and old process
...
Fix inventory record does not need status at creation
2019-09-06 01:52:51 +02:00
Laurent Destailleur
37a32af7b0
NEW Add dictionary to store public holidays.
2019-09-05 20:19:13 +02:00
Laurent Destailleur
50957ab621
Sync transifex
2019-09-05 16:51:20 +02:00
Laurent Destailleur
8e7f836534
Fix trans
2019-09-05 16:23:04 +02:00
Laurent Destailleur
92e7d7bb26
Fix duplicate translation
2019-09-05 16:18:20 +02:00
Christophe Battarel
1cfd5615d3
resolv conflict
2019-09-05 16:10:23 +02:00
VESSILLER
b70587c150
NEW check if a resource is in use in an event
2019-09-04 15:14:16 +02:00
Tim Otte
54d0b94b6d
Added extrafield support to the product supplier price lines
2019-09-04 15:13:42 +02:00
florian HENRY
73c5b9617f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-09-03 17:07:59 +02:00
Laurent Destailleur
bd47bd096b
NEW Can defined a position of numbering submodules for thirdparties
2019-09-03 15:58:20 +02:00
Laurent Destailleur
2c02e4d118
Merge branch 'develop' into FIX_cron_module_conf_to_display_link_to_cron_task_list
2019-09-03 15:28:52 +02:00
Laurent Destailleur
a9bb891760
Merge pull request #11767 from aspangaro/11.0_digitaria
...
NEW Digitaria model for numbering accountancy thirdparty
2019-09-03 15:01:10 +02:00
Laurent Destailleur
95f3db1267
Fix translation
2019-09-03 14:41:39 +02:00
Florian Mortgat
c63a08b71b
FIX: display a link to cron/list.php instead of just instructions on how to get there.
...
Note: will have no impact until translations are updated; French & English updates provided
2019-09-03 10:39:40 +02:00
Laurent Destailleur
c068177027
Work on search on global site files
2019-09-02 16:39:56 +02:00
florian HENRY
405c92640c
on going
2019-09-02 14:47:32 +02:00
Laurent Destailleur
04057cd83e
Prepare reengeneering of project usage
2019-09-01 02:02:38 +02:00
Laurent Destailleur
af6e25d928
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-31 12:37:58 +02:00
Laurent Destailleur
7e19a64ff2
Sync transifex
2019-08-31 02:17:50 +02:00
Christophe Battarel
8c8844d7ae
Differentiate supplier orders status
2019-08-30 09:33:01 +02:00
Laurent Destailleur
8eae59945d
Fix trans
2019-08-30 04:19:33 +02:00
Laurent Destailleur
210effc742
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-30 04:18:23 +02:00
Laurent Destailleur
e54dbecf6d
Sync transifex
2019-08-30 04:17:40 +02:00
Laurent Destailleur
6009601254
Use graph for stats on products/services
2019-08-30 04:15:24 +02:00
Laurent Destailleur
3b96271bd7
Add a warning to avoid headache
2019-08-30 02:21:34 +02:00
Laurent Destailleur
a8eb0e87a8
Translate
2019-08-29 02:11:46 +02:00
Laurent Destailleur
e421b4b698
Trans
2019-08-28 10:12:39 +02:00
Laurent Destailleur
bb893fd3a8
FIX Missing the filter fields in export of expense report and leaves
2019-08-27 18:16:34 +02:00
Laurent Destailleur
12a09b8b2a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/takepos/invoice.php
2019-08-27 15:56:56 +02:00
Laurent Destailleur
1ac9affd82
Trans
2019-08-27 15:54:44 +02:00
Alexandre SPANGARO
958361b45e
Merge branch 'develop' into 11.0_digitaria
2019-08-27 14:11:27 +02:00
Alexandre SPANGARO
d7f8df2e45
NEW Digitaria model for numbering accountancy thirdparty
2019-08-27 14:03:33 +02:00
Laurent Destailleur
7009f036a0
Merge pull request #11744 from andreubisquerra/master
...
Control errors before validate invoice in TakePOS
2019-08-26 17:24:03 +02:00
Laurent Destailleur
999db7ed41
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/salaries/card.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/takepos/invoice.php
2019-08-26 16:49:25 +02:00
Laurent Destailleur
0c8640bfd9
FIX #11752
2019-08-26 16:09:20 +02:00
andreubisquerra
5d0dbea920
Control errors before validate invoice in TakePOS
2019-08-24 16:44:06 +02:00
Laurent Destailleur
1463302bdd
Add option to disable the anonymous ping
2019-08-23 16:23:31 +02:00
Laurent Destailleur
775dd18b22
Merge pull request #11712 from andreubisquerra/master
...
NEW Add 'Direct Cash Payment' button in TakePOS
2019-08-22 11:22:57 +02:00
Laurent Destailleur
30266b00eb
Trans
2019-08-22 01:25:25 +02:00
Laurent Destailleur
f5aede8256
NEW GeoIP v2 support is natively provided.
2019-08-21 19:38:45 +02:00
Laurent Destailleur
008bb16c7f
Fix trans
2019-08-21 03:41:36 +02:00
andreubisquerra
f1b80fc19a
Add 'Direct Cash Payment' button in TakePOS
2019-08-20 23:44:30 +02:00
Laurent Destailleur
bfe6f4a163
Fix RESTRICT_ON_API
2019-08-20 20:32:17 +02:00
Laurent Destailleur
fd3f890f7b
NEW Can restrict access using DAV module to some host IPs only
2019-08-20 14:15:04 +02:00
Laurent Destailleur
65d11704bb
Fix Protect DAV when $dolibarr_main_authentication is forceuser
...
Compatibility with twoauth
2019-08-20 13:46:15 +02:00
Laurent Destailleur
fb8e66a662
Trans
2019-08-19 18:34:54 +02:00
Laurent Destailleur
998c25f8d6
Translation
2019-08-19 17:08:58 +02:00
Laurent Destailleur
cc3fd0f1f6
Merge pull request #11679 from atm-john/develop_new_task_progress_bar
...
FIX/NEW task widget and add task progress bar
2019-08-19 10:05:16 +02:00
Laurent Destailleur
6abfd8b145
Fix use short labels for workboard
2019-08-19 10:01:42 +02:00
Laurent Destailleur
c989a63360
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/langs/en_US/cashdesk.lang
2019-08-18 20:54:06 +02:00
Laurent Destailleur
cef88283b3
Fix missing error message
2019-08-18 20:52:18 +02:00
Laurent Destailleur
7e4cf224ec
Merge branch 'develop' into develop_new_task_progress_bar
2019-08-18 05:38:45 +02:00
Laurent Destailleur
3f105a97bf
Debug the new workboard
2019-08-18 04:56:48 +02:00
Laurent Destailleur
5351d78a96
Merge branch 'develop' into develop_new_dashboard
2019-08-18 01:26:56 +02:00
Laurent Destailleur
2147d505c3
NEW Can restrict API usage to some IP only
2019-08-17 21:44:37 +02:00
Laurent Destailleur
b99b49c542
Enhance website module
2019-08-17 17:39:31 +02:00
Laurent Destailleur
2510c1e5e4
Better help text
2019-08-16 03:05:55 +02:00
Laurent Destailleur
fa53641221
Merge pull request #11551 from atm-quentin/NEW_global_search_product
...
NEW Add hidden option to set fields for the quick search on products
2019-08-15 20:26:05 +02:00
Laurent Destailleur
56bc7b62ff
Update products.lang
2019-08-15 20:25:08 +02:00
Laurent Destailleur
a346b052e7
Enhance help
2019-08-15 18:37:57 +02:00
Laurent Destailleur
b5d72edebc
Can add more samples of pages. Add an exemple of page with dynamic
...
content.
2019-08-15 18:07:36 +02:00
Laurent Destailleur
f81463af0c
Update templates
2019-08-15 00:55:47 +02:00
Laurent Destailleur
b2f1cb22e8
Add tooltip in website module
2019-08-14 23:57:44 +02:00
Laurent Destailleur
2b805cc63d
Add tooltip help in CSS edition
2019-08-14 23:47:01 +02:00
Laurent Destailleur
8e0a023270
FIX Disabling a website does not put it offline
2019-08-13 05:05:19 +02:00
Laurent Destailleur
983dc80d9e
FIX Disabling a website does not put it offline
2019-08-13 05:03:45 +02:00
Laurent Destailleur
7824731f17
NEW Add feature to search a string into containers
2019-08-13 00:34:42 +02:00
Laurent Destailleur
8ad2081555
NEW Can select website templates from available default templates
2019-08-12 22:19:24 +02:00
Laurent Destailleur
de1af78ae6
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-12 17:38:54 +02:00
Laurent Destailleur
b3e9cf3be7
Sync transifex
2019-08-12 17:37:23 +02:00
Laurent Destailleur
86d39b435b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-12 02:42:11 +02:00
ATM john
f10f29f632
Add filters
2019-08-12 01:01:16 +02:00
ATM john
22c4a1b49e
Merge branch 'develop_new_dashboard' of github.com:atm-john/dolibarr into develop_new_task_progress_bar
2019-08-11 09:57:13 +02:00
ATM john
09c1289802
Fix task widget and improve its display
2019-08-10 22:48:07 +02:00
ATM john
527e4dcf46
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_task_progress_bar
2019-08-10 15:41:49 +02:00
ATM john
3f0f7e2ad5
Add progress bar for task list and visual status badges
2019-08-10 15:41:21 +02:00
Laurent Destailleur
8647a20c18
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/langs/en_US/admin.lang
htdocs/product/dynamic_price/class/price_parser.class.php
htdocs/product/stats/facture.php
2019-08-10 01:57:43 +02:00
Laurent Destailleur
9c92acadaa
Fix lang
2019-08-10 01:51:50 +02:00
Laurent Destailleur
2824dee11a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/product/dynamic_price/class/price_parser.class.php
2019-08-10 01:20:17 +02:00
John Botella
4aeaa580ea
Add color blind option
2019-08-07 11:11:47 +02:00
John Botella
bc0508164b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard
2019-08-06 09:57:49 +02:00
Frédéric FRANCE
baa2e870d0
Update admin.lang
...
found in admin/company.php
2019-08-05 11:01:58 +02:00
Laurent Destailleur
b294f22285
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-04 13:07:09 +02:00
Laurent Destailleur
5339bb71ac
FIX Fatal situation if payment removed on expense report. Action
...
set_unpaid was not available.
2019-08-03 20:57:21 +02:00
Laurent Destailleur
7f42380f83
FIX Fatal situation if payment removed on expense report. Action
...
set_unpaid was not available.
2019-08-03 20:53:57 +02:00
Laurent Destailleur
f3e38f4b09
FIX Fatal situation if payment removed on expense report. Action
...
set_unpaid was not available.
2019-08-03 20:53:18 +02:00
John Botella
b4c4e5a662
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard
2019-08-02 14:52:01 +02:00
John Botella
3992256046
add missing trans
2019-08-02 14:12:17 +02:00
John Botella
83d0f1f27f
Add weather
2019-08-02 12:22:26 +02:00
atm-quentin
eca1029cd8
missing trans
2019-08-01 15:22:39 +02:00
Laurent Destailleur
d7a41c6b72
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
2019-08-01 12:54:27 +02:00
John Botella
9b84987cc1
prepare new dashboard
2019-08-01 12:33:19 +02:00
Laurent Destailleur
5eb8f05061
FIX #11584
2019-08-01 12:23:02 +02:00
Laurent Destailleur
12b530c418
FIX Setup of TakePos was not possible after a clean install
2019-08-01 11:27:35 +02:00
Laurent Destailleur
814c405021
Add link to retry payment if error
2019-08-01 03:54:54 +02:00
Laurent Destailleur
a7390e7e47
Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop
...
NEW Management of retained warranty on situation invoices
2019-07-30 21:53:09 +02:00
Laurent Destailleur
5cbde99871
Merge pull request #11579 from atm-maxime/new_withdraw_date_rum
...
NEW Can edit date or RUM mandate
2019-07-30 16:04:57 +02:00
Laurent Destailleur
334e1a6737
Merge pull request #11583 from aspangaro/11.0_LDcompta
...
NEW Accountancy Add export model LDCompta V9 & higher
2019-07-30 15:59:43 +02:00
Maxime Kohlhaas
be6ad7b6a4
New : can define RUM date on third bank account
2019-07-28 17:10:37 +02:00
Laurent Destailleur
a46bfc7a29
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/project.lib.php
2019-07-25 17:54:14 +02:00
atm-quentin
efd89588e5
fix trans
2019-07-25 12:21:28 +02:00
Laurent Destailleur
907ba62054
Sync transifex
2019-07-24 14:59:03 +02:00
atm-quentin
5a385bf1cc
ADD extrafields on global search
2019-07-24 09:41:02 +02:00
Laurent Destailleur
bf55733678
NEW Replace the "info" tab on contract with the more complete "agenda"
...
tag.
2019-07-23 02:45:31 +02:00
Laurent Destailleur
bef3423764
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
2019-07-22 19:12:27 +02:00
Laurent Destailleur
f5afc50067
Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries
2019-07-22 18:47:35 +02:00
Alexandre SPANGARO
2c74caff90
WIP
2019-07-22 06:56:55 +02:00
Laurent Destailleur
f0f0b989e9
FIX Add warning when setup is strange
2019-07-21 16:41:01 +02:00
Laurent Destailleur
865ebb9de2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/ticket/class/ticket.class.php
2019-07-20 13:29:10 +02:00
Laurent Destailleur
20e58bdd97
FIX Limit of uploaded files (max_post_size was not used)
2019-07-20 13:09:25 +02:00
Alexandre SPANGARO
8b8aaafc05
Merge branch 'develop' into 10.0_intracommreport
2019-07-20 05:47:31 +02:00
Alexandre SPANGARO
0af1206892
Merge branch 'develop' into 11.0_salaries
2019-07-19 23:11:06 +02:00
Alexandre SPANGARO
9ab0734415
NEW Extrafields on salaries
2019-07-19 23:08:24 +02:00
Laurent Destailleur
48b4aa4c8d
Fix link to ticket
2019-07-19 18:29:33 +02:00
Alexandre SPANGARO
df73345046
NEW Accountancy Add export model LDCompta V9 & higher
2019-07-19 17:07:55 +02:00
Laurent Destailleur
1053a9d955
Trans
2019-07-19 16:49:12 +02:00
Laurent Destailleur
fea810fb3b
Trans
2019-07-19 13:44:30 +02:00
Laurent Destailleur
14751680d2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-19 13:38:05 +02:00
Laurent Destailleur
2e08c02510
Better error management
2019-07-19 13:37:28 +02:00
Laurent Destailleur
1f308915ee
Fix trans
2019-07-19 13:23:17 +02:00
Laurent Destailleur
278c2d7152
Enhance the perf page
2019-07-19 12:58:21 +02:00
Laurent Destailleur
50480bf517
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/opensurvey/index.php
2019-07-18 18:23:24 +02:00
Laurent Destailleur
3cffd70ed3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/prelevement/create.php
htdocs/core/class/commonobject.class.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/commande/dispatch.php
htdocs/fourn/product/list.php
htdocs/opensurvey/index.php
htdocs/ticket/index.php
htdocs/ticket/list.php
2019-07-18 18:09:37 +02:00
Laurent Destailleur
b044d95acf
Merge
2019-07-18 17:50:15 +02:00
Laurent Destailleur
c1df3ae5c1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-18 11:10:18 +02:00
Laurent Destailleur
a23bae6c96
Work to mke the page perf.php public by default.
2019-07-18 11:10:09 +02:00
Laurent Destailleur
917799914e
Merge pull request #11433 from atm-florianm/FIX_increase_stock_on_shipment_delete_when_STOCK_CALCULATE_ON_SHIPMENT_CLOSE_is_set
...
FIX: stock increase on shipment deletion if STOCK_CALCULATE_ON_SHIPMENT_CLOSE is set
2019-07-16 13:52:50 +03:00
Laurent Destailleur
6c23154a91
FIX #11506
2019-07-15 22:59:18 +02:00
Laurent Destailleur
adfbd62f8b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-14 00:44:35 +02:00
Laurent Destailleur
ee109ac568
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-05 17:44:50 +02:00
Laurent Destailleur
93d9f73f1d
Trans
2019-07-05 17:44:31 +02:00
Laurent Destailleur
9b32763919
Fix label for report n ledger for transitionnal bank account on tranfer
2019-07-05 15:25:29 +02:00
Laurent Destailleur
c3715646e7
Missing trans
2019-07-04 21:29:27 +02:00
Laurent Destailleur
1c33dd2e75
Merge pull request #11436 from fbosman/fbosman-patch-1
...
Feature request: Extrafields - store computed value #11435
2019-07-04 16:23:08 +02:00
Laurent Destailleur
f2c1568d09
NEW Extrafields separator can be collapsed or not
2019-07-04 15:43:05 +02:00
atm-florian.m
64d1ebf59c
FIX: on shipment delete confirm dialog, a new checkbox allows the user to choose if they want their stock re-incremented after the deletion.
2019-07-04 15:06:39 +02:00
Frans Bosman
f8a5ae90e3
Update admin.lang
2019-07-03 16:43:47 +02:00
atm-florian.m
3e53a06b2e
minor spelling issues
2019-07-03 16:17:47 +02:00
John Botella
9c2e83dcae
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-07-01 09:51:26 +02:00
Laurent Destailleur
36e240a16d
NEW Add statistics on product into contracts
2019-06-29 02:03:57 +02:00
Laurent Destailleur
ad53289a19
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-27 20:13:51 +02:00
Laurent Destailleur
63284e0f24
Trans
2019-06-27 19:42:22 +02:00
Laurent Destailleur
c7db76f05a
Trans
2019-06-27 19:38:53 +02:00
Laurent Destailleur
ab1f0aba93
Fix trans
2019-06-27 19:28:40 +02:00
Laurent Destailleur
6136dd6e7c
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-27 13:57:08 +02:00
Laurent Destailleur
8c6485fa20
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
ChangeLog
htdocs/compta/facture/card.php
2019-06-27 13:56:33 +02:00
Laurent Destailleur
7f9b407c37
Sync transifex
2019-06-27 13:52:46 +02:00
Laurent Destailleur
84e4def180
Transifex sync
2019-06-27 13:39:54 +02:00
Laurent Destailleur
244d21bd2b
Fix trans
2019-06-27 00:45:17 +02:00
Alexandre SPANGARO
8f0f8f74f7
WIP
2019-06-26 17:13:38 +02:00
Alexandre SPANGARO
9da91c06ed
Merge branch 'develop' into 10.0_intracommreport
2019-06-26 15:11:43 +02:00
Laurent Destailleur
7c73004171
Fix trans
2019-06-26 13:14:16 +02:00
John Botella
7e14a598e2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-26 09:43:43 +02:00
Laurent Destailleur
51a1550dbb
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
2019-06-25 23:14:49 +02:00
Laurent Destailleur
70967b4ea1
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/utils.class.php
2019-06-25 20:06:39 +02:00
Laurent Destailleur
d41850c7cd
Fix purge of old files
2019-06-25 20:02:14 +02:00
Laurent Destailleur
27ad0d1f88
Trans
2019-06-25 16:35:25 +02:00
Alexandre SPANGARO
14a99041a3
WIP
2019-06-25 15:31:18 +02:00
Laurent Destailleur
229dd4d3f5
Merge branch 'develop' into 10.0_accounting6
2019-06-24 19:59:11 +02:00
Laurent Destailleur
604633afd1
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-24 18:45:15 +02:00
Laurent Destailleur
35c3eb0d7e
Fix conflict in a translation key
2019-06-24 17:59:00 +02:00
Laurent Destailleur
bf731e3de6
Fix trans
2019-06-24 16:30:55 +02:00
John Botella
7b6925b8f7
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-24 10:29:43 +02:00
Alexandre SPANGARO
4a84dcaa62
Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport
2019-06-23 21:47:34 +02:00
Laurent Destailleur
9c54de57ce
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-23 18:12:56 +02:00
Laurent Destailleur
8866ab5565
Fix missing trans
2019-06-23 16:42:06 +02:00
Laurent Destailleur
22b91f3693
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 13:28:44 +02:00
Laurent Destailleur
0f808114e5
Sync transifex
...
Fix CSS for Left To Right Languages
2019-06-22 13:18:33 +02:00
Laurent Destailleur
b111636ed0
Fix trans
2019-06-20 18:32:25 +02:00
Laurent Destailleur
8da5794777
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/accounting.lib.php
htdocs/product/stock/class/entrepot.class.php
2019-06-20 18:24:43 +02:00
Laurent Destailleur
c521b9b8f8
Fix dispatch in ledger table of withdraw / direct debit payment
2019-06-20 16:58:51 +02:00
Laurent Destailleur
4ffa48d9bd
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-20 13:50:47 +02:00
Laurent Destailleur
afb6362317
Fix look and feel v10
...
Fix link to direct debit payment order
2019-06-20 13:37:06 +02:00
Laurent Destailleur
e9da44e023
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-20 12:33:02 +02:00
Laurent Destailleur
1a6dc83d4c
Fix: default accounting account for eec and export sales were not used.
2019-06-20 12:25:58 +02:00
Alexandre SPANGARO
20b516885f
WIP
2019-06-20 09:33:01 +02:00
Laurent Destailleur
a264a4766a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-20 03:45:04 +02:00
Laurent Destailleur
554724a46f
Merge pull request #11363 from aspangaro/10.0_other
...
Translate rights
2019-06-20 03:36:16 +02:00
Laurent Destailleur
e99cf13ccf
Merge pull request #11225 from ATM-Nicolas/new_propal_list_column
...
NEW Add hidden option PROPOSAL_SHOW_INVOICED_AMOUNT (not reliable if one invoice is done on several order or several proposal)
2019-06-20 03:27:45 +02:00
Laurent Destailleur
382ec1a106
Merge pull request #11254 from andreubisquerra/master
...
Basic phone layout for Restaurants in TakePOS
2019-06-20 03:14:23 +02:00
Laurent Destailleur
daab58974e
Merge pull request #11366 from aspangaro/10.0_other2
...
Missing language key
2019-06-20 03:02:13 +02:00
Alexandre SPANGARO
abfb708044
Merge branch 'develop' into 10.0_intracommreport
2019-06-19 21:43:40 +02:00
Laurent Destailleur
7c4cddf28d
Fix missing trad
2019-06-19 16:34:01 +02:00
Laurent Destailleur
5b5028254f
Fix label
2019-06-19 16:30:03 +02:00
Laurent Destailleur
a11c816a17
Fix tooltip
2019-06-19 14:24:48 +02:00
Laurent Destailleur
f9cc120d75
Debug module ticket
2019-06-19 12:53:28 +02:00
Alexandre SPANGARO
ffbb14f40e
Missing language key
2019-06-19 06:28:22 +02:00
Alexandre SPANGARO
13836d3e21
Missing language ley
2019-06-19 06:21:53 +02:00
Alexandre SPANGARO
f91c40a45c
Translate rights
2019-06-19 06:00:11 +02:00
Alexandre SPANGARO
9234a54468
Translate rights
2019-06-19 05:49:23 +02:00
Alexandre SPANGARO
e1c476e744
Translate rights
2019-06-19 05:48:04 +02:00
Alexandre SPANGARO
42b03ec858
Translate rights
2019-06-18 22:53:50 +02:00
Alexandre SPANGARO
a0ae1e96a3
Translate rights
2019-06-18 22:52:37 +02:00
Alexandre SPANGARO
4de0a57f5c
Translate rights
2019-06-18 22:44:43 +02:00
Alexandre SPANGARO
ce37544088
Translate rights
2019-06-18 22:41:18 +02:00
Alexandre SPANGARO
c59de49894
Translate rights
2019-06-18 22:38:52 +02:00
Frédéric FRANCE
a399e3f63d
Update companies.lang
2019-06-17 13:33:44 +02:00
Frédéric FRANCE
baf95c3c86
Update agenda.lang
2019-06-14 16:47:53 +02:00
Laurent Destailleur
f00c9a10db
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2019-06-13 12:15:51 +02:00
Laurent Destailleur
e81663ec34
Fix cropping of image files for BOM module was ko
2019-06-12 19:00:34 +02:00
Laurent Destailleur
a7e0589071
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-12 13:59:22 +02:00
Laurent Destailleur
f41606ba15
Merge branch '10.0' into 10.0_Differentiated_export
2019-06-12 13:27:49 +02:00
Laurent Destailleur
aaed26b9b0
Update main.lang
2019-06-12 13:04:28 +02:00
Laurent Destailleur
32849db6d8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-06-12 12:10:07 +02:00
Laurent Destailleur
91a4e8bc0a
Merge
2019-06-12 12:09:56 +02:00
Alexandre SPANGARO
c5ff0894be
Accountancy : Fix language key
2019-06-10 22:10:49 +02:00
Alexandre SPANGARO
a0ab2fdfd7
Fix Missing language key
2019-06-09 08:29:44 +02:00
Alexandre SPANGARO
39fa4f9365
Fix Missing language key
2019-06-08 21:34:30 +02:00
Laurent Destailleur
1520ca9646
Fix buttons for payments
2019-06-07 13:51:53 +02:00
Laurent Destailleur
e3812e3b0c
FIX source template invoice not loaded/shown
2019-06-05 08:20:10 +02:00
John BOTELLA
d7a393bbd3
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-04 14:00:18 +02:00
Laurent Destailleur
ba2b07917b
Fix look and feel v10
2019-06-04 02:11:03 +02:00
Laurent Destailleur
1415ad5b53
Debug website module
2019-06-02 17:27:00 +02:00
andreubisquerra
45fabede28
Basic phone layout for Restaurants in TakePOS
2019-05-26 16:44:17 +02:00
Laurent Destailleur
b5b5e1f6db
More completepaybox integration with HMAC
2019-05-26 14:37:31 +02:00
Laurent Destailleur
410932f3f2
Trans
2019-05-26 12:01:08 +02:00
Laurent Destailleur
a5865d3e4a
Debug BOM
2019-05-25 19:29:33 +02:00
Laurent Destailleur
bca5a56db1
Merge pull request #11236 from a-schild/develop
...
Add accountancy export option for Sage50 Swiss
2019-05-24 12:52:51 +02:00
Laurent Destailleur
ceba186de8
Trans
2019-05-23 22:42:26 +02:00
Alexandre SPANGARO
2085958a69
Merge branch 'develop' into 10.0_Differentiated_export
2019-05-23 11:10:07 +02:00
Alexandre SPANGARO
4ba8cf0641
Fix
2019-05-23 11:08:06 +02:00
Alexandre SPANGARO
d4384f507d
WIP
2019-05-23 09:25:09 +02:00
Alexandre SPANGARO
65070afce4
WIP
2019-05-22 17:22:49 +02:00
a-schild
ab646450d6
Revert changes in DE/FR/IT languages, since they are generated/maintained via Transifex
2019-05-22 17:03:49 +02:00
Alexandre SPANGARO
a182b89bb0
Merge branch 'develop' into 10.0_closure2
2019-05-22 13:52:13 +02:00
a-schild
445a66ed21
Added sage50 swiss translation texts for EN/DE/FR/IT
2019-05-22 10:21:35 +02:00
Laurent Destailleur
2c0c1dbef3
Debug modulebuilder
2019-05-21 16:16:19 +02:00
Laurent Destailleur
eafc35b00f
Look and feel v10
2019-05-21 13:27:45 +02:00
Alexandre SPANGARO
d9e9cb2ea9
Merge branch 'develop' into 10.0_Differentiated_export
2019-05-20 15:02:05 +02:00
Alexandre SPANGARO
a239e0e81f
WIP Admin
2019-05-20 13:33:54 +02:00
ATM-Nicolas
d58603bd1e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_propal_list_column
2019-05-20 09:13:37 +02:00
ATM-Nicolas
6be48e6952
NEW : Amount HT invoiced column in propal list
2019-05-20 08:59:44 +02:00
Frédéric FRANCE
aef850f6d3
zapier for dolibarr
2019-05-19 21:12:22 +02:00
Alexandre SPANGARO
f9e3a958c4
NEW Module Intracomm report
2019-05-19 10:44:09 +02:00
Laurent Destailleur
2bbb04085e
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/modulebuilder/template/class/myobject.class.php
2019-05-19 02:15:01 +02:00
Maxime Kohlhaas
ea4dcbc77a
Add translation
2019-05-18 17:07:55 +02:00
Laurent Destailleur
b40eb92ce7
Mass action for closing members
2019-05-18 16:25:45 +02:00
Laurent Destailleur
bd1ed4f7ac
Merge branch 'develop' into 10.0_Differentiated_export
2019-05-16 21:26:20 +02:00
Laurent Destailleur
ced2c7383a
Merge pull request #11178 from aspangaro/10.0_openconcerto
...
NEW Accountancy Add OpenConcerto export format
2019-05-16 21:24:14 +02:00
Laurent Destailleur
53b7f3fe92
Merge pull request #11173 from aspangaro/10.0_accountancy_cat
...
NEW Add accoutancy sell intra and export in product import
2019-05-16 21:14:46 +02:00
Marc de Lima Lucio
d428f79d46
NEW: new line template: hidden conf to fill service dates from the last service line
2019-05-15 12:26:39 +02:00
Alexandre SPANGARO
f123f9951f
NEW Add OpenConcerto export format
2019-05-15 12:16:03 +02:00
Laurent Destailleur
9f8f45d5bc
FIX Payment on supplier invoice should not mix credit note and standard
...
invoices.
2019-05-14 12:00:58 +02:00
Alexandre SPANGARO
7c9ccee64d
NEW Accountancy - Differentiated export
2019-05-14 05:45:36 +02:00
Alexandre SPANGARO
d99424cdf0
NEW Add accoutancy sell intra and export in product import
2019-05-13 21:19:18 +02:00
Laurent Destailleur
7a75567ad9
FIX Debug ticket module
2019-05-12 16:34:49 +02:00
Laurent Destailleur
a664cd6461
Fix check when uploading a non image as user photo
2019-05-10 20:09:41 +02:00
Laurent Destailleur
acc57343a9
Trans
2019-05-09 18:34:10 +02:00
Laurent Destailleur
78c4a3cced
Fix lang
2019-05-09 18:33:50 +02:00
Laurent Destailleur
2ff81cd262
Fix duplicate key
2019-05-09 18:08:23 +02:00
Laurent Destailleur
a5b1de4f6a
Fix tab that should not be visible
2019-05-09 17:52:55 +02:00
Laurent Destailleur
46b0545c4a
Debug module reception
2019-05-09 17:26:06 +02:00
Laurent Destailleur
a94c291b76
Dolibarization
2019-05-09 16:59:06 +02:00
Laurent Destailleur
b8f2f957bf
Sync transifex
2019-05-09 16:58:31 +02:00
Laurent Destailleur
2ffad20e9f
fix typo
2019-05-09 16:37:46 +02:00
Laurent Destailleur
9672c7ccca
Translation
2019-05-09 16:21:53 +02:00
Laurent Destailleur
84714f39e2
Fix setup of terminal
2019-05-09 13:37:20 +02:00
Laurent Destailleur
6e69db8a1a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/product/doc/pdf_standard.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
htdocs/filefunc.inc.php
2019-05-09 12:27:14 +02:00
Laurent Destailleur
d3bbb93ada
Fix template for situation
...
Conflicts:
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2019-05-09 12:16:43 +02:00
andreubisquerra
84cfa00bf1
Terminals
2019-05-08 18:29:00 +02:00
Laurent Destailleur
1e036f3513
Correct support for type price on module builder
...
Fix link of ref in cash fence list
2019-05-08 01:09:38 +02:00
ATM-Nicolas
77d3f22163
NEW : Amount invoiced column in propal list
2019-05-07 14:39:16 +02:00
Alexandre SPANGARO
4baffae297
Merge remote-tracking branch 'upstream/develop' into 10.0_closure2
2019-05-05 22:43:02 +02:00
Alexandre SPANGARO
4e16992796
WIP
2019-05-05 14:07:42 +02:00
Laurent Destailleur
60bf3452c3
Hide export in EEC for non european countries
2019-05-04 12:26:54 +02:00
Laurent Destailleur
3ad478c25e
Merge pull request #11109 from aspangaro/develop
...
NEW Manage account sell_intra & sell_export in page accoutancy admin default product
2019-05-04 12:18:23 +02:00
Laurent Léonard
476d15868c
Fix civility translation in dutch dict language file
2019-05-04 06:25:53 +02:00
Alexandre SPANGARO
0359b1820a
Merge remote-tracking branch 'upstream/develop' into develop
2019-05-03 14:10:57 +02:00
Alexandre SPANGARO
61547e3f82
NEW Manage account sell_intra & sell_export in page default product
2019-05-03 14:08:20 +02:00
Laurent Destailleur
dd4e70efe7
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
htdocs/accountancy/class/lettering.class.php
2019-05-03 12:14:17 +02:00
Laurent Destailleur
e694d0b2c2
Merge pull request #11101 from aspangaro/9.0_lettering
...
FIX Massive debug in lettering function
2019-05-03 11:39:45 +02:00
Laurent Destailleur
eab49d4300
NEW Update Stripe library to 6.34.3
2019-05-03 02:22:27 +02:00
Laurent Destailleur
10d853cdb3
Work on stripe payment using intent with option
...
STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION
2019-05-02 21:54:28 +02:00
Laurent Destailleur
8442c86436
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/functions.lib.php
htdocs/index.php
2019-05-02 17:40:41 +02:00
Laurent Destailleur
4899d03ff8
FIX Confusion between expired and late
2019-05-02 17:15:24 +02:00
Alexandre SPANGARO
cbe23741eb
FIX Massive debug in lettering function
2019-05-02 14:06:55 +02:00
Laurent Destailleur
e2c7c0574e
Merge pull request #11086 from andreubisquerra/master
...
NEW Add history to view and print previous sales on TakePos.
2019-05-02 14:04:57 +02:00
Laurent Destailleur
a75223c850
Debug ticket module
2019-05-02 13:53:13 +02:00
Laurent Destailleur
e81f10c790
Debug hidden option MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION
2019-05-02 13:45:49 +02:00
Laurent Destailleur
4a81e8fd62
Debug call to apilayer
2019-05-02 13:24:28 +02:00
Laurent Destailleur
4756499a81
Debug module builder for generation of APIs
2019-05-02 12:03:14 +02:00
Laurent Destailleur
90a1181dc5
Debug module Ticket
2019-05-01 20:41:03 +02:00
Laurent Destailleur
9955af5194
Debug ticket module
2019-05-01 17:53:41 +02:00
Laurent Destailleur
61bf731d17
FIX Balance of td
2019-04-30 18:11:35 +02:00
Laurent Destailleur
0cd1fc79f2
NEW Add a security permission to edit php dynamic content on website.
2019-04-30 13:05:13 +02:00
Laurent Destailleur
3007905508
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/core/modules/modProduct.class.php
htdocs/core/modules/modService.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/stripe/class/stripe.class.php
2019-04-30 03:30:40 +02:00
Laurent Destailleur
c12a16abea
Fix trans
2019-04-30 02:49:13 +02:00
Laurent Destailleur
d55c440740
Fix some product and services export profiles
2019-04-29 21:23:01 +02:00
Laurent Destailleur
c7fcecc336
Fix email not loaded
2019-04-29 17:17:25 +02:00
andreubisquerra
00db274956
Add history to view and print previous sales.
2019-04-28 18:12:33 +02:00
Laurent Destailleur
0c432c28a8
Trans
2019-04-26 13:08:19 +02:00
Laurent Destailleur
4bd732cc40
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/export.php
htdocs/core/class/utils.class.php
htdocs/langs/en_US/website.lang
2019-04-25 23:25:21 +02:00
Laurent Destailleur
63c0ab93fb
FIX CVE-2019-11201
2019-04-25 23:21:25 +02:00
Laurent Destailleur
10dde837d0
Debug email collector
2019-04-25 19:32:48 +02:00
Laurent Destailleur
091132de2f
Signatures of methods createFromClone() has been standardized. All
...
methods requires the object User as first parameter.
2019-04-25 12:11:32 +02:00
Laurent Destailleur
e5c2027dbb
NEW Add accounting code for eec sales and export sales on products
2019-04-25 01:16:29 +02:00
Laurent Destailleur
fe3fe60efc
Cleaner setup page
2019-04-24 18:31:11 +02:00
Laurent Destailleur
4d92d7731c
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/sendings.lib.php
htdocs/langs/en_US/admin.lang
htdocs/theme/eldy/style.css.php
2019-04-23 12:32:08 +02:00
Laurent Destailleur
09914f31f9
Trans
2019-04-23 12:14:50 +02:00
Laurent Destailleur
c0b12ee94a
Typo
2019-04-22 12:24:21 +02:00
Alexandre SPANGARO
3729e32368
Assets - Debug - Look & field v10
2019-04-18 14:13:48 +02:00
Alexandre SPANGARO
660a1cea1d
NEW Accounting - Add rights on export, delete operations in ledger
2019-04-17 07:26:39 +02:00
Laurent Destailleur
8d18915746
Work on edit link of expense report line and files
2019-04-12 18:18:04 +02:00
Laurent Destailleur
b2da5cedbc
Translation
2019-04-11 21:09:07 +02:00
Laurent Destailleur
a3782f7060
Transifex sync
2019-04-11 16:08:50 +02:00
Laurent Destailleur
203cbd56c2
Finished debug of emailcollector module
2019-04-10 17:35:33 +02:00
Laurent Destailleur
4f2a3d6bdd
Debug ticket module
2019-04-10 16:23:16 +02:00
Laurent Destailleur
2eeb4b8734
Debug ticket module
2019-04-10 15:45:55 +02:00
Laurent Destailleur
26594fab98
Debug module ticket
2019-04-10 15:11:38 +02:00
Laurent Destailleur
1f6f6f6edb
Track action close for ticket
2019-04-10 13:21:06 +02:00
Laurent Destailleur
ff629b2355
NEW Color for hover and for checked line is on by default
2019-04-09 15:57:26 +02:00
Laurent Destailleur
f9860e1425
Work on email collector
2019-04-09 13:23:30 +02:00
Laurent Destailleur
c0b3ee23e5
Fix phpcs
2019-04-08 23:50:18 +02:00
Laurent Destailleur
65e931cfe2
Work on email collector
2019-04-08 21:22:10 +02:00
Laurent Destailleur
36aa53e88d
Missing trans
2019-04-08 19:40:52 +02:00
Laurent Destailleur
1b415a6aed
Fix translation of help tooltip on fields for modulebuilder.
2019-04-08 14:42:46 +02:00
Laurent Destailleur
2b87c8b663
Merge pull request #10810 from mwelters/patch-1
...
NEW improve Expensereport, Inverse Receiver
2019-04-08 14:04:08 +02:00
Laurent Destailleur
a7ced8ab5d
Merge pull request #10963 from aspangaro/v10_p3
...
NEW: Accounting - Invert module name
2019-04-08 13:39:51 +02:00
Laurent Destailleur
8accc894b0
Update admin.lang
2019-04-08 13:36:11 +02:00
Laurent Destailleur
22ca858b36
Enhance setup of email collector
2019-04-07 18:32:01 +02:00
Laurent Destailleur
fad2fa48dd
NEW Introduce a config parameter $dolibarr_main_instance_unique_id
2019-04-07 15:44:17 +02:00
Laurent Destailleur
56194091a9
trans
2019-04-06 13:27:38 +02:00
Laurent Destailleur
0fd1f9abf6
Show if there is no uploaded files
2019-04-05 19:39:30 +02:00
Christophe Battarel
d0fcece613
dont make generic translations
2019-04-05 11:34:23 +02:00
Christophe Battarel
f167ad910e
camelCase and generic cloneCategories function
2019-04-05 11:30:51 +02:00
Alexandre SPANGARO
4335ea9064
NEW: Accounting - Invert module name
2019-04-04 17:13:20 +02:00
Laurent Destailleur
56f8c42b0a
The PHP extension php-intl is not mandatory but should be installed to
...
have new features working correctly.
2019-04-03 19:37:54 +02:00
Laurent Destailleur
eb6bd20132
Fix error message
2019-04-03 16:16:51 +02:00
Laurent Destailleur
853a0ab7a3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-04-03 14:38:42 +02:00
Laurent Destailleur
7120078b0f
NEW Simplification of styles architcture: Showing or not the menuhider
...
is completely decided by CSS and screen size instead of PHP+CSS.
2019-04-03 13:26:50 +02:00
Laurent Destailleur
ebd3a04f7f
Fix translation
2019-04-02 19:48:58 +02:00
Laurent Destailleur
42fda54edf
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/fichinter/list.php
htdocs/product/stock/replenish.php
2019-04-02 19:41:58 +02:00
Laurent Destailleur
9b77cc4db8
Translation of currency
2019-04-02 19:33:14 +02:00
Laurent Destailleur
37b8796f3c
NEW Add line total on list of payments
2019-04-02 17:54:34 +02:00
Laurent Destailleur
84f895bbaf
Merge pull request #10941 from inoveaconseil/modulebuilder2
...
NEW advanced parameters for initiate a new module
2019-03-31 19:02:13 +02:00
Laurent Destailleur
67c207db12
NEW Better explanation for setup of WebDav module
2019-03-30 11:58:49 +01:00
Laurent Destailleur
26e3f41f73
Translation
2019-03-29 16:18:47 +01:00
Laurent Destailleur
ecc7afa4e3
Removed duplicate code
2019-03-29 15:27:00 +01:00
Laurent Destailleur
f1db09fc4f
Shwo field time billed and not billed on list of tasks
2019-03-29 13:18:12 +01:00
Nicolas ZABOURI
1e9287c9d8
0.1
2019-03-28 23:57:17 +01:00
Laurent Destailleur
80f7cef0a8
Better translation
2019-03-28 09:20:05 +01:00
Laurent Destailleur
8998e4c6a3
Fix add of a table in floor for Bar and Restaurant
2019-03-27 18:40:02 +01:00
Laurent Destailleur
6e643e90cf
Translation
2019-03-27 18:00:44 +01:00
Laurent Destailleur
7b8443c350
Fix trans
2019-03-26 20:34:09 +01:00
Laurent Destailleur
4b378a8d4b
Merge branch 'develop' into PaiementsModes
2019-03-26 19:45:39 +01:00
Laurent Destailleur
24af5cfab5
Merge pull request #10912 from Tetras-Libre/VATGrouped
...
TakePOS tickets : Grouped VAT
2019-03-26 19:22:40 +01:00
Laurent Destailleur
f991d4ba99
Fix typo
2019-03-26 18:10:28 +01:00
Laurent Destailleur
aad3867b9b
Fix translation
2019-03-26 14:00:01 +01:00
Laurent Destailleur
9eaef2ce7a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/export.php
htdocs/langs/en_US/admin.lang
2019-03-26 12:40:36 +01:00
Laurent Destailleur
1787b31932
FIX setup of module export
2019-03-26 12:18:28 +01:00
Laurent Destailleur
0f2dd5dc34
Add label for tax
2019-03-24 23:36:40 +01:00
Laurent Destailleur
c148157566
Remove duplicate translation keys
2019-03-24 23:29:22 +01:00
David Beniamine
f4e23ea427
Merge branch 'develop' into PaiementsModes
2019-03-24 21:34:33 +01:00
David Beniamine
b554ca2b73
Merge branch 'develop' into VATGrouped
2019-03-24 21:06:29 +01:00
David Beniamine
833da30af1
Use any dolibarr enabled paiement mode
2019-03-24 21:01:42 +01:00
David Beniamine
4b61f0d606
Grouped VAT
...
Add an option to group VAT by rate in receipt
2019-03-24 20:17:41 +01:00
markus
f942917f53
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1
2019-03-24 17:42:49 +01:00
Laurent Destailleur
7d54c7a480
Fix translation
2019-03-22 14:38:06 +01:00
Laurent Destailleur
cd6a0bacdd
Look and feel v10
2019-03-22 14:32:15 +01:00
Laurent Destailleur
1b558d70c1
Fix menu translation
2019-03-22 12:42:23 +01:00
Laurent Destailleur
438b20df42
Merge pull request #10903 from Tetras-Libre/AutoPrintTicketsOption
...
Automatically print receipt
2019-03-22 12:28:49 +01:00
Laurent Destailleur
c43cf843a9
Merge branch 'theme_top_menu_login' of https://github.com/atm-john/dolibarr into atm-john-theme_top_menu_login
2019-03-22 11:15:02 +01:00
David Beniamine
10ab6f480d
Automatically print receipt
2019-03-22 09:28:58 +01:00
Christophe Battarel
61f9aac887
begin factorization of categories cloning
2019-03-18 14:16:41 +01:00
Christophe Battarel
7bc0260661
begin factorization of categories cloning
2019-03-18 14:15:55 +01:00
Laurent Destailleur
bb8845ac41
Merge pull request #10865 from atm-maxime/new_box_birthdays
...
NEW Widget birthdays of the month
2019-03-18 08:56:58 +01:00
Laurent Destailleur
b3dc6d7d1d
NEW Generation of doc by modulebuilder can include README and CHANGELOG
2019-03-17 19:33:25 +01:00
Maxime Kohlhaas
e090cd6f87
New box birthdays of the month
2019-03-17 16:55:26 +01:00
Laurent Destailleur
39b9ca2397
Work on documentation generation by modulebuilder
2019-03-17 15:45:50 +01:00
Laurent Destailleur
7f007f4182
Prepare modulebuilder to work on core modules
2019-03-17 02:46:28 +01:00
Laurent Destailleur
6a41819d0f
Enhance the perf page.
2019-03-17 00:55:18 +01:00
Laurent Destailleur
a6add0d8a9
Debug module debugbar
2019-03-17 00:48:12 +01:00
Laurent Destailleur
1abfd1f58e
Add page to setup module debugbar
...
Fix CSS
2019-03-17 00:32:39 +01:00
Laurent Destailleur
c2badb57d7
NEW: Add module debugbar
2019-03-16 16:27:14 +01:00
Laurent Destailleur
a2d6723ff3
WIP Link files to expense report lines
2019-03-15 15:07:52 +01:00
Laurent Destailleur
86c5dc20e3
NEW Can choose the root category to show for TakePOS module
2019-03-15 02:12:40 +01:00
Laurent Destailleur
ca31f654e7
Reduce text for graph title
2019-03-14 23:42:22 +01:00
Laurent Destailleur
8f65ee2296
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode
2019-03-14 17:48:44 +01:00
Laurent Destailleur
5ccfba1210
FIX Edit of personalized groups
...
Conflicts:
htdocs/accountancy/admin/categories.php
2019-03-14 16:06:20 +01:00
Laurent Destailleur
3ab5c3e6ab
FIX Edit of personalized groups
2019-03-14 16:03:37 +01:00
Laurent Destailleur
7f23a396a9
Merge pull request #10794 from aspangaro/10.0_AccountancyMenuV2
...
NEW: Accounting - More comprehensive menu
2019-03-14 14:29:01 +01:00
Laurent Destailleur
39e6e71b0d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
2019-03-14 14:20:34 +01:00
Laurent Destailleur
7b8b6bb02f
Merge pull request #10804 from hregis/9.0_merge
...
FIX possibility to set up payment mode when invoice module is disabled
2019-03-14 14:09:00 +01:00
Laurent Destailleur
7e31e6b4f6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/notify.class.php
2019-03-13 19:30:25 +01:00
Laurent Destailleur
e0208cb3d6
Generation of PDF doc
2019-03-13 18:11:15 +01:00
Laurent Destailleur
0e1479ef4e
Lang
2019-03-13 11:04:14 +01:00
Laurent Destailleur
98ca9bf17a
Reduce quantity of string to translates
2019-03-12 19:44:59 +01:00
Laurent Destailleur
6ae36ce6a7
Work on BOM
2019-03-12 19:20:01 +01:00
Laurent Destailleur
c2063c5d0b
Fix bad translation
2019-03-12 18:24:55 +01:00
Laurent Destailleur
fe6b682ec0
NEW Add visibility with value 4 in framework to define fields to show on
...
forms and list but not on creation forms.
2019-03-12 17:45:19 +01:00
John BOTELLA
d62db95803
Add trad and icon
2019-03-12 14:22:20 +01:00
Regis Houssin
47057b431d
FIX translation
2019-03-12 07:56:22 +01:00
markus
63a3e3df11
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1
2019-03-11 12:38:49 +01:00
Christophe Battarel
3215e066e4
copy linked categories when cloning a product
2019-03-11 10:00:44 +01:00
Laurent Destailleur
935fe7c22a
Debug and enhance modulebuilder.
2019-03-10 19:33:28 +01:00
markus
d7ca08afb0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1
2019-03-10 15:26:35 +01:00
Laurent Destailleur
d659543ac0
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-03-09 19:00:57 +01:00
Laurent Destailleur
441b577599
Add missing trans
2019-03-09 12:58:52 +01:00
Laurent Destailleur
b710e28ffa
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/admin/adherent.php
htdocs/admin/barcode.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/langs/en_US/admin.lang
2019-03-09 01:20:13 +01:00
markus
1e4ed531b4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2019-03-08 11:47:08 +01:00
Laurent Destailleur
1a96a7a88f
FIX More complete auto setup of barcode module
...
Add tooltip help on member setup module
2019-03-08 11:31:12 +01:00
Alexandre SPANGARO
5d06e53f1b
NEW: Accounting - More comprehensive menu
2019-03-08 09:11:56 +01:00
Laurent Destailleur
0798f7b719
NEW Can upload files from the edit page of expense report
2019-03-07 20:53:03 +01:00
Laurent Destailleur
f54eb78260
NEW Show the latest date of subscription in member statistics reports
2019-03-07 12:22:24 +01:00
Laurent Destailleur
a426c8e9bf
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/compta/facture/class/facture.class.php
htdocs/filefunc.inc.php
htdocs/install/upgrade2.php
htdocs/product/class/product.class.php
2019-03-07 11:16:24 +01:00
Laurent Destailleur
e163849d05
Fix label
2019-03-06 19:13:59 +01:00
Laurent Destailleur
16e90ffae4
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/DolibarrModules.class.php
htdocs/langs/en_US/website.lang
2019-03-05 15:59:42 +01:00
Laurent Destailleur
f402966eb8
Missing translation
2019-03-05 15:48:12 +01:00
Laurent Destailleur
b851911708
Dolibarize module ticket
2019-03-05 12:18:46 +01:00
Laurent Destailleur
4a582485b9
Debug module ticket
2019-03-04 19:19:09 +01:00
markus
c905575d3e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2019-03-04 17:26:40 +01:00
Laurent Destailleur
cff6cd9662
Merge pull request #10731 from andreubisquerra/master
...
Add Order Notes to TakePOS
2019-03-04 16:02:26 +01:00
Laurent Destailleur
7b7ff33fdf
Work on BOM module
2019-03-04 13:30:43 +01:00
Laurent Destailleur
a46b7f5202
Work of BOM module
2019-03-04 12:49:22 +01:00
andreubisquerra
b1e9a0fe38
Add Order Notes to TakePOS
2019-03-03 12:50:36 +01:00
Laurent Destailleur
c4e96e9f74
Fix language
2019-02-27 13:48:13 +01:00
atm-quentin
f51b89def3
NEW supplier buyprice barcode
2019-02-27 09:22:34 +01:00
Laurent Destailleur
b33b3698c8
Merge pull request #10691 from aspangaro/develop
...
NEW: Add graphic option for ACCOUNTANCY_COMBO_FOR_AUX
2019-02-27 02:18:20 +01:00
Laurent Destailleur
a6e9da192c
Update accountancy.lang
2019-02-27 02:18:00 +01:00
Laurent Destailleur
7618a7348f
Merge branch 'develop' into 10.0_accountancy2
2019-02-27 01:51:01 +01:00
Laurent Destailleur
3a2a1b4a56
Debug module ticket
2019-02-26 13:43:09 +01:00
markus
d38bff6f14
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2019-02-26 12:31:24 +01:00
Alexandre SPANGARO
1c59554806
NEW: Add graphic option for ACCOUNTANCY_COMBO_FOR_AUX
2019-02-25 22:22:31 +01:00
Laurent Destailleur
fc1d0b2dd5
Add missing translation
2019-02-25 19:07:29 +01:00
Laurent Destailleur
25d277aceb
More complete translation
2019-02-25 19:02:41 +01:00
Laurent Destailleur
5ffc1822d9
Translation
2019-02-25 19:01:51 +01:00
Laurent Destailleur
b4e3bb37af
Sync transifex
2019-02-23 15:11:41 +01:00
Laurent Destailleur
9aa8de3367
FIX #10644
2019-02-23 15:10:18 +01:00
Laurent Destailleur
4eac819df0
Trans
2019-02-20 05:22:05 +01:00
Laurent Destailleur
4296f959ca
Invert option MAIN_HIDE_VERSION into ! MAIN_SHOW_VERSION
...
Reorganize levels of menu accountancy
2019-02-20 04:55:35 +01:00
ptibogxiv
c3346fead9
fix lang
2019-02-19 12:57:08 +01:00
ptibogxiv
091d2b9d68
FIX lang
2019-02-19 12:55:48 +01:00
Alexandre SPANGARO
f5b5859089
Language
2019-02-18 07:16:00 +01:00
Alexandre SPANGARO
49a975beb3
Update works
2019-02-18 07:14:21 +01:00
Alexandre SPANGARO
93a0cdd6d6
NEW: Add accounting account for result
...
Use for closure workflow
2019-02-18 06:00:21 +01:00
markus
aa5dfb3cf9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2019-02-16 14:43:35 +01:00
andreubisquerra
8cc2662f01
Update TakePOS in Dolibarr 9
2019-02-14 20:59:32 +01:00
markus
db6cce479e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2019-02-13 13:26:56 +01:00
florian HENRY
5b5f96bafb
NEW : measuring unit dictionnary and product size/unit import
2019-02-12 16:58:11 +01:00
Laurent Destailleur
04950a5c91
Trans
2019-02-12 16:29:37 +01:00
markus
34026d1005
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2019-02-12 13:53:17 +01:00
markus
33b34f57a8
Fix de/main.lang
2019-02-12 13:53:11 +01:00
Laurent Destailleur
205152501e
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/public/payment/newpayment.php
2019-02-12 13:39:39 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-12 13:33:39 +01:00
Laurent Destailleur
f0e56abac7
NEW Module ticket is available as a stable module
2019-02-11 19:16:37 +01:00
Laurent Destailleur
9353cf976d
Fix translation
2019-02-11 18:44:43 +01:00
Frédéric FRANCE
b041eeae22
first parameter of print_liste_field_titre was translated
2019-02-10 18:11:34 +01:00
Frédéric FRANCE
ba32c3b782
first parameter of print_liste_field_titre was translated
2019-02-10 16:06:07 +01:00
Frédéric FRANCE
af3adcecb0
first parameter of print_liste_field_titre was translated
2019-02-10 15:48:53 +01:00
Laurent Destailleur
7d20321b3b
Fix trans
2019-02-09 19:24:52 +01:00
Laurent Destailleur
0839b39c52
Fix translation
2019-02-09 19:15:36 +01:00
Laurent Destailleur
d38ead798a
Trans
2019-02-09 19:12:24 +01:00
Laurent Destailleur
c77d328f12
Fix translation
2019-02-09 19:05:15 +01:00
Laurent Destailleur
7f4bbcf9a5
Some minor fix in default values and modulebuilder
2019-02-09 13:40:22 +01:00
florian HENRY
3f20cae6d3
NEW: setup default thridparty type (customer or prospect/customer)
2019-02-06 10:54:11 +01:00
Laurent Destailleur
9e28db4202
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/export.php
2019-02-06 00:51:10 +01:00
Laurent Destailleur
7c24847fa3
Typo
2019-02-05 19:38:28 +01:00
Laurent Destailleur
7436a3bc73
Typo
2019-02-05 19:37:58 +01:00
Laurent Destailleur
66998c4873
Fix translation
2019-02-05 19:37:22 +01:00
Laurent Destailleur
0345c00f0a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-05 16:45:10 +01:00
Laurent Destailleur
bb315a6f12
Fix trans
2019-02-05 16:44:10 +01:00
Laurent Destailleur
d49dd8d593
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-05 15:16:44 +01:00
Laurent Destailleur
541f6e537e
Fix link to pay membership renewal
2019-02-05 14:05:39 +01:00
Laurent Destailleur
b58c49d0bb
Trans
2019-02-05 13:59:23 +01:00
Laurent Destailleur
d6501d996c
Missing trans
2019-02-05 13:56:55 +01:00
Laurent Destailleur
48ab519841
Fix typo
2019-02-03 21:40:56 +01:00
Laurent Destailleur
5a6e46a9c3
Doc
2019-02-03 21:40:23 +01:00
andreubisquerra
8b1b8bb7a3
CSS improvements and Takepos setup check
2019-02-02 23:57:38 +01:00
Laurent Destailleur
28c1b1ce58
Work on billing time spent
2019-02-01 22:39:36 +01:00
Laurent Destailleur
9d03f4b228
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-01 18:17:02 +01:00
Laurent Destailleur
b83ff06db8
FIX #10416 No need of another option
2019-02-01 17:00:04 +01:00
Laurent Destailleur
eb3621839a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/members.lang
htdocs/langs/fr_FR/members.lang
2019-02-01 15:14:19 +01:00
Laurent Destailleur
b14a16a119
Code comment
2019-02-01 13:48:09 +01:00
Laurent Destailleur
c05628c746
Fix edit member module setup
2019-01-31 20:27:55 +01:00
Laurent Destailleur
0a56069f67
Fix trans
2019-01-31 19:42:55 +01:00
Laurent Destailleur
4c31749f4b
Add tooltip on setup
2019-01-31 11:11:56 +01:00
Laurent Destailleur
d0b20178e0
Merge pull request #10442 from aspangaro/10.0_accountancy_default
...
NEW: When you create product or service, sell accountancy account by default are proposed
2019-01-30 16:30:13 +01:00
Laurent Destailleur
7983a85bb2
Update accountancy.lang
2019-01-30 16:29:45 +01:00
Laurent Destailleur
60fa8d08c2
Merge pull request #10456 from aspangaro/10.0_Ledger_improve_import
...
FIX: FEC Compatibility for import in ledger
2019-01-30 15:01:02 +01:00
Alexandre SPANGARO
1b675ba0b6
FIX: FEC Compatibility for import in ledger
2019-01-30 09:51:29 +01:00
Alexandre SPANGARO
64975b3b9e
NEW: When you create product or service, sell accountancy account by default are proposed
2019-01-28 22:27:55 +01:00
Alexandre SPANGARO
cc88c4f8ff
Move my email to the new one
2019-01-28 21:39:22 +01:00
Laurent Destailleur
5cd60f4e26
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-28 16:27:54 +01:00
Laurent Destailleur
9dbf41d6b2
Fix lang format
2019-01-28 16:25:06 +01:00
Laurent Destailleur
4545c0f13a
Fix lang format of en_ZA
2019-01-28 16:25:01 +01:00
Laurent Destailleur
820db4e78b
Fix lang format
2019-01-28 16:22:53 +01:00
Laurent Destailleur
2dea4f01f5
Fix lang format of en_ZA
2019-01-28 16:22:36 +01:00
andreubisquerra
bec25fb45c
Remove absolut divs and add Dolistore POS category link to TakePOS
2019-01-27 01:28:32 +01:00
Laurent Destailleur
f313791e57
Merge pull request #10400 from andreubisquerra/master
...
Bills and coins pad, or Num pad in TakePOS
2019-01-26 13:55:45 +01:00
Laurent Destailleur
cfa850cd20
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-26 01:32:00 +01:00
Laurent Destailleur
2c8557e2e0
Work on invoicing of time spent
2019-01-24 18:16:14 +01:00
Laurent Destailleur
c95b915db3
Merge branch '9.0' of github.com:Dolibarr/dolibarr into 9.0
2019-01-24 07:07:31 +01:00
Laurent Destailleur
ecb16cf914
Trans
2019-01-24 07:07:26 +01:00
andreubisquerra
5b3559418f
Bills and coins pad, or Num pad in TakePOS
2019-01-23 20:59:34 +01:00
Laurent Destailleur
f9686c47af
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/fr_FR/members.lang
htdocs/langs/fr_FR/stocks.lang
htdocs/website/index.php
2019-01-23 19:22:42 +01:00
Laurent Destailleur
ad54a2b8af
Fix website edit of virtualhost
2019-01-23 15:06:28 +01:00
Laurent Destailleur
e33f102dc2
FIX Edit of virtualhost
2019-01-23 14:57:43 +01:00
Laurent Destailleur
bb1e7ee0a1
Fix transifex
2019-01-22 19:54:47 +01:00
Laurent Destailleur
c5686df035
Sync transifex
2019-01-22 18:16:08 +01:00
Laurent Destailleur
eefa57bf6b
Sync transifex
2019-01-22 18:15:47 +01:00
Laurent Destailleur
ccbec3d29f
Fix typo
2019-01-22 16:27:23 +01:00
Laurent Destailleur
51bdf5f949
Fix trans
2019-01-22 16:06:20 +01:00
Laurent Destailleur
5c2b9e3078
NEW Introduce PhpSpreadsheet for export (need php5.6+)
2019-01-21 14:06:01 +01:00
Laurent Destailleur
c26f264cac
Merge pull request #10369 from mwelters/mwelters/addays
...
Add configurable days to SEPA Withdrawal Execution Date
2019-01-20 19:47:57 +01:00
Laurent Destailleur
300889f53a
# WARNING: head commit changed in the meantime
...
Fix
2019-01-19 13:22:38 +01:00
Laurent Destailleur
4cf624e448
Merge pull request #10366 from ptibogxiv/patch-90
...
Fix: members.lang
2019-01-19 11:20:52 +01:00
Philippe GRAND
59cfa02bdb
missing translation
2019-01-18 16:21:06 +01:00
markus
de9b8f427d
Add configurable days to SEPA Withdrawal Execution Date
2019-01-18 16:16:55 +01:00
Laurent Destailleur
971670da8d
Clean language file
2019-01-18 14:24:49 +01:00
ptibogxiv
796b19bc1b
Update members.lang
2019-01-17 22:40:34 +01:00
Laurent Destailleur
ab5aaa6b43
Start debug compta-files
2019-01-17 00:32:43 +01:00
Laurent Destailleur
c357cb8c4e
Clean code
2019-01-16 12:42:54 +01:00
Laurent Destailleur
d6b0f852c5
Work on invoicing time spent
2019-01-15 21:01:01 +01:00
Laurent Destailleur
48e7fcd821
Remove not used keys
2019-01-13 16:55:46 +01:00
Laurent Destailleur
ab3365440c
Fix translation
2019-01-13 16:51:34 +01:00
Laurent Destailleur
653acf556b
Fix translation Customer order into Sales order
2019-01-10 12:15:42 +01:00
Laurent Destailleur
22d4afbb62
Missing trans
2019-01-10 01:54:06 +01:00
Laurent Destailleur
126e02798a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/cashdesk.lang
htdocs/langs/fr_FR/cashdesk.lang
2019-01-07 19:49:15 +01:00
Laurent Destailleur
1188540b41
Sync transifex
2019-01-07 19:39:41 +01:00
Laurent Destailleur
527ef8bdc8
Add nb of invoice to help cash fence
2019-01-07 19:02:38 +01:00
Laurent Destailleur
1403ac3cc1
Trans
2019-01-07 18:07:56 +01:00
ldestailleur
451b3e30cc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/cashdesk.lang
2019-01-04 19:36:20 +01:00
ldestailleur
cf84fdf7c7
Translate option "Simplify interface for blind persons"
2019-01-03 20:07:58 +01:00
ldestailleur
1b19f5153b
Fix cash fence feature
2019-01-03 14:18:02 +01:00
ldestailleur
dbbfdd984a
Fix emailcollector can't be used without syntax rules
2019-01-03 11:47:27 +01:00
Laurent Destailleur
08b1e67e5c
Merge pull request #10275 from aspangaro/10.0_accountancy_member
...
NEW: Accountancy - Add default accounting account for member subcription
2019-01-02 19:51:30 +01:00
andreubisquerra
8dee9de8f5
Add header and footer to TakePOS receipt
2018-12-30 22:20:55 +01:00
Alexandre SPANGARO
a2075b9d2c
V9 look & Feel, etc
2018-12-30 20:32:44 +01:00
Alexandre SPANGARO
41c7af590d
NEW: Accountancy - Add default accounting account for member subcriptions
2018-12-29 22:11:24 +01:00
Laurent Destailleur
afac151793
Merge pull request #10261 from torvista/import
...
Changes for csv import of Third Parties and Products
2018-12-22 18:40:37 +01:00
Laurent Destailleur
20f6f8887a
Fix typo
2018-12-22 18:40:00 +01:00
Laurent Destailleur
4ae88642ec
Fix typo
2018-12-22 18:35:51 +01:00
Laurent Destailleur
a997001dbf
Fix typo
2018-12-22 18:34:48 +01:00
Laurent Destailleur
78460d2f60
Merge pull request #10257 from torvista/langs-en_US
...
langs-en_US
2018-12-22 18:33:37 +01:00
Laurent Destailleur
3d509910dd
Merge branch 'develop' into master
2018-12-22 18:24:23 +01:00
Laurent Destailleur
afee39ea68
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-21 12:09:27 +01:00
Laurent Destailleur
4859d944d8
Sync transifex
2018-12-21 12:09:03 +01:00
Laurent Destailleur
391f916bd5
Fix trans
2018-12-21 10:21:56 +01:00
Laurent Destailleur
ae6596cac7
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-21 09:57:29 +01:00
torvista
2ff35895b6
minor improvements
...
new constants for missing direct debit terms
2018-12-20 23:36:35 +01:00
Steve
70c0adc3d1
import.php
...
HTML5 validation
ADDED htmlentities to enclosure and separator
CHANGED td aligns to css, removed nospan tag
ADDED clause to box generator to stop multiple duplicate ids when no $key
REMOVED height attribute
REMOVED nested b tag
CHANGED deprecated Center tag for div style center
FIX
Added check
if ($objimport->array_import_updatekeys[0] && count($objimport->array_import_updatekeys[0]
to stop php warning
------------------
modProduct.class.php
Products Import
ordered fields as per table structure order
ADDED and changed import fields and examples
------------------
modSociete.class.php
Third Party Import
Changed field orders to match table field order so future additions will be easier to manage.
REMOVED s.datec repeated in import example
ADDED: alias, payment mode, payment conditions, sales tax VAT, multicurrency, currency
Additional Address Import
Changed field orders to match table field order
import example csv was missing birthday
Bank Account Import
Changed field orders to match table field order
ADDED label (required for a bank account
ADDED datec (required for d.debit UMR)
ADDED to address import: s.fk_departement
modified text to import example csv
-------------------
companies.lang
various new constants for import file column headers
2018-12-20 16:49:17 +01:00
torvista
54436f72c7
minor improvements
2018-12-20 13:38:49 +01:00
andreubisquerra
c4be1b141d
Temporary ticket improvement in TakePOS
2018-12-19 22:52:16 +01:00
torvista
9f9a468f6a
more fine tuning
2018-12-19 16:22:27 +01:00
Laurent Destailleur
b0652494b5
Debug cash fence
2018-12-19 15:40:01 +01:00
Laurent Destailleur
44a6644969
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-18 21:55:53 +01:00
Laurent Destailleur
89068ffef1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/adherents/subscription.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/langs/es_ES/companies.lang
htdocs/langs/es_ES/errors.lang
htdocs/product/stock/product.php
htdocs/user/card.php
2018-12-18 21:55:14 +01:00
Laurent Destailleur
c3eb131054
Debug ticket module
2018-12-18 13:30:22 +01:00
Laurent Destailleur
48162db33d
FIX Rename of image file lose the thumbs
2018-12-17 20:19:11 +01:00
Laurent Destailleur
623afd1020
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-12-17 18:50:06 +01:00
Laurent Destailleur
ffaff4dc7f
Debug website module
2018-12-17 17:29:04 +01:00
Laurent Destailleur
e014fdc20b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-17 11:43:02 +01:00
Laurent Destailleur
e06b06c788
Work on cash fence
2018-12-17 10:37:56 +01:00
Laurent Destailleur
cbb5e3bbe9
Better translation
2018-12-17 03:31:20 +01:00
Laurent Destailleur
af4405c669
FIX Replenishment with option STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE
2018-12-16 20:29:08 +01:00
Laurent Destailleur
9ce07b9582
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
2018-12-16 15:36:18 +01:00
Laurent Destailleur
988ba172ae
Clean code of POS modules
2018-12-16 14:59:51 +01:00
Juanjo Menent
6ce0d3e279
FIX: Vendor translations are in english
2018-12-16 11:16:12 +01:00
Laurent Destailleur
54a4a54afe
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/langs/en_US/banks.lang
2018-12-15 20:00:31 +01:00
Laurent Destailleur
a601859985
Work on cash fence
2018-12-15 19:58:43 +01:00
Laurent Destailleur
0451eb741b
Work on legal cash fence
2018-12-15 19:20:30 +01:00
Laurent Destailleur
54ffba793f
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
htdocs/langs/en_US/admin.lang
2018-12-15 18:21:37 +01:00
Laurent Destailleur
944f9ac894
Typo
2018-12-15 18:14:08 +01:00
Laurent Destailleur
527ad04ae8
FIX Mandatory field feature should works on textarea
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-12-15 18:13:30 +01:00
Laurent Destailleur
6188156c52
FIX Mandatory field feature should works on textarea
2018-12-15 18:11:40 +01:00
Laurent Destailleur
eb66d45947
Merge branch 'develop' into 10.0_accoutancy_stats
2018-12-15 15:17:15 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception
2018-12-15 12:50:31 +01:00
Laurent Destailleur
699dc239d4
Fix US trans
2018-12-15 12:24:14 +01:00
Laurent Destailleur
69c666162f
Update projects.lang
2018-12-15 12:13:54 +01:00
Laurent Destailleur
2fafef6b7d
Merge branch 'develop' into lang-en_US
2018-12-15 12:11:22 +01:00
Laurent Destailleur
ec3465e65f
Merge pull request #9995 from delcroip/develop
...
Add a link for compta-files.php in the accountancy leftmenue
2018-12-15 12:09:42 +01:00
torvista
6f5f4bd3de
added latest Develop edits
2018-12-14 20:33:07 +01:00
torvista
805c184163
more supplier->vendor found!
...
use of e-mail, EMail, Email rationalised
grammar changes for module titles and descriptions
added constants for Stripe to admin to override class constants
2018-12-14 20:17:22 +01:00
Laurent Destailleur
83efdee7d3
Merge branch 'develop' into new_mass_generate
2018-12-14 15:44:46 +01:00
Laurent Destailleur
0c3165a79a
Merge branch 'develop' into email-contact-card
2018-12-14 15:26:15 +01:00
Laurent Destailleur
9e83699193
Merge branch 'develop' into new_branch_31_10_2018
2018-12-14 14:27:35 +01:00
Laurent Destailleur
55487da03e
Merge branch 'develop' into langs_en_US
2018-12-14 11:09:25 +01:00
torvista
1c7189ed40
supplier->vendor
...
suppliers->vendors
2018-12-13 22:24:45 +01:00
Juanjo Menent
22c34bd656
Fix: MenuBankCash Translation is in english in es_ES
2018-12-12 12:09:07 +01:00
torvista
2abb2f054d
Fix conflict
2018-12-11 23:12:08 +01:00
torvista
1226868bd9
missed one
2018-12-11 10:36:36 +01:00
torvista
351274d85d
1) Standardization of use of "third party"
...
as a noun : third party
as an modifier: third-party contact
2) use of colons: no space before
3) Use of supplier/vendor was mixed.
Vendor is B2B or B2C, supplier is B2B. Changed all references to supplier.
4) Many minor grammar changes.
2018-12-11 10:08:19 +01:00
Laurent Destailleur
434cf2e046
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-11 09:58:14 +01:00
Laurent Destailleur
e2a575e547
Fix use of external url in iframes
2018-12-10 18:44:45 +01:00
Laurent Destailleur
6105bb2bb6
Fix: difference between text and url into external web site module
2018-12-10 18:10:57 +01:00
Laurent Destailleur
b35a9c0e64
FIX Edition of menu fails (mainmenu required for top menu)
2018-12-10 17:50:58 +01:00
Laurent Destailleur
f3a67d6c3f
FIX Show warning when trying to create task on closed project
2018-12-10 15:06:54 +01:00
Laurent Destailleur
dbee87aa9d
Trans
2018-12-10 13:10:28 +01:00
Laurent Destailleur
cd3716ff9f
Dolibarize module ticket
2018-12-08 16:37:41 +01:00
Laurent Destailleur
2621af96d6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/install/upgrade2.php
2018-12-07 19:08:53 +01:00
Laurent Destailleur
a9a191819f
Work on billing time spent
2018-12-06 21:25:28 +01:00
Laurent Destailleur
163cac5349
Trans lead
2018-12-06 20:25:22 +01:00
Laurent Destailleur
275eeca135
Trans
2018-12-04 13:09:58 +01:00
Alexandre SPANGARO
0c6f6b80cb
Merge remote-tracking branch 'upstream/develop' into 10.0_accoutancy_stats
2018-12-03 21:16:53 +01:00
Laurent Destailleur
7c46ace042
Merge pull request #10153 from atm-maxime/fix_user_photo
...
Fix user photo path
2018-12-02 17:07:14 +01:00
Juanjo Menent
aa2ecd4b73
Merge pull request #10162 from aljawaid/aljawaid-ecm_translations
...
FIX: Add Missing Translation Strings into ecm.lang
2018-12-02 15:51:40 +01:00
IJ
30f1925177
FIX: Add Missing Translation Strings into ecm.lang
...
- ECMDocsByHolidays
- ECMDocsBySupplierProposals
2018-12-02 12:29:52 +00:00
Alexandre SPANGARO
088c002ed1
NEW: Add stats on entries & movements by fiscal year
2018-12-02 11:01:11 +01:00
Maxime Kohlhaas
72225f6524
Migration of user photo paths
2018-12-01 23:57:15 +01:00
andreubisquerra
1009588592
TakeBOX now is 'TakePOS Connector'
2018-12-01 17:09:21 +01:00
Inovea Conseil
6201962dcf
Fix missing translation
2018-11-30 23:27:05 +01:00
Laurent Destailleur
94c2d7194c
Trans Website
2018-11-30 12:41:35 +01:00
Laurent Destailleur
10fc0149d8
responsive
2018-11-29 11:03:02 +01:00
Laurent Destailleur
3c0ff40e43
Fix trans
2018-11-29 00:41:12 +01:00
Laurent Destailleur
ca1f9c7e60
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/class/don.class.php
htdocs/langs/es_ES/admin.lang
htdocs/langs/es_ES/sendings.lang
htdocs/langs/es_ES/stocks.lang
2018-11-28 16:57:39 +01:00
Juanjo Menent
2f61d29b06
FIX : #10080 Supplier translations are in english
2018-11-28 10:40:45 +01:00
Laurent Destailleur
0b6aaccfcc
sync transifex
2018-11-27 16:35:47 +01:00
Laurent Destailleur
e95c6091c4
Fix lang
2018-11-27 11:10:39 +01:00
Laurent Destailleur
0367795488
Fix auto jump on record if only 1 record in a search
2018-11-27 11:09:47 +01:00
Laurent Destailleur
71bcabd8eb
Missing trans
2018-11-27 10:23:58 +01:00
Laurent Destailleur
7c22504252
Fix position of field must be ssame between create/edit/view
2018-11-27 09:22:59 +01:00
Laurent Destailleur
611569f639
Add missing translation
2018-11-26 11:18:01 +01:00
Laurent Destailleur
1d2c2a23ef
Fix look and feel v8
2018-11-25 11:57:19 +01:00
Laurent Destailleur
5bd9c14929
Update demo data for 8.0 and 9.0
2018-11-23 14:05:45 +01:00
Laurent Destailleur
ea7c77d788
Trans
2018-11-23 11:09:27 +01:00
Laurent Destailleur
a06b032c23
fix trans
2018-11-23 10:53:04 +01:00
Laurent Destailleur
97af22369d
Trans
2018-11-22 13:47:55 +01:00
Laurent Destailleur
3bb7726101
Revert "Fix translation"
...
This reverts commit 8de30c12d8
2018-11-22 13:22:05 +01:00
Laurent Destailleur
8de30c12d8
Fix translation
2018-11-22 13:19:25 +01:00
Laurent Destailleur
6514b51382
Better help
2018-11-20 21:59:05 +01:00
Laurent Destailleur
200de22807
Missing image in container
2018-11-20 16:48:34 +01:00
Laurent Destailleur
4b82538941
Better module position
2018-11-20 14:56:14 +01:00
Laurent Destailleur
839428d545
Missing trans
2018-11-19 19:02:00 +01:00
Laurent Destailleur
a3398f1a8d
Sync transifex
2018-11-19 15:49:58 +01:00
Laurent Destailleur
1e1ccd4c88
Fix pagination in action/event list
2018-11-19 14:25:34 +01:00
Laurent Destailleur
a179d45afd
Remove deprecated translation keys
2018-11-17 23:40:10 +01:00
Laurent Destailleur
1cce95cb23
Trans
2018-11-17 23:35:49 +01:00
Laurent Destailleur
13d00b2eb1
Sync transifex
2018-11-17 23:14:12 +01:00
Laurent Destailleur
7f33403d43
Fix translation
2018-11-17 22:55:13 +01:00
Laurent Destailleur
6b8a3094f0
Fix missing some keys in substitution arrays
2018-11-17 00:14:23 +01:00
Laurent Destailleur
5d596fe584
Fix trackid must contains an id of instance
2018-11-16 16:43:13 +01:00
Laurent Destailleur
f32706259a
Sync transifex
2018-11-16 14:13:00 +01:00
Laurent Destailleur
7d5c9959bc
Close #9978
...
Better way to address the feature. Work in most cases, need less code
and less sql access.
2018-11-15 18:20:38 +01:00
Laurent Destailleur
85cdc44105
Several fixes in project creation, cache of dolGetIfFromCode, ...
2018-11-15 13:39:12 +01:00
Laurent Destailleur
0b57faa7b4
Fix help
2018-11-11 14:42:11 +01:00
patrick Delcroix
e9d3db084a
new: link to the compta-files.php in the accountancy left menu
2018-11-10 15:35:56 +01:00
Laurent Destailleur
bd78ea1ccf
Merge pull request #9987 from frederic34/dkim
...
add admin dkim translation
2018-11-10 12:16:43 +01:00
Laurent Destailleur
e86e3ec7ac
Work on email collector
2018-11-09 19:30:44 +01:00
Laurent Destailleur
f1287578f3
Work on emailcollector
2018-11-09 18:18:17 +01:00
Frédéric FRANCE
6cd27d8c80
add admin dkim translation
2018-11-09 18:08:06 +01:00
Laurent Destailleur
50bd8bc4ce
Merge pull request #9969 from grandoc/new_branch_07_11_2018
...
fix : missing translation
2018-11-08 19:55:25 +01:00
Laurent Destailleur
193b153fbf
Work on email collector
2018-11-07 18:02:08 +01:00
Laurent Destailleur
6ba78b2bb3
Work on email collector
2018-11-07 16:33:06 +01:00
Philippe GRAND
671b4dc227
fix : missing translation
2018-11-07 14:01:49 +01:00
Laurent Destailleur
c4db549f94
Work on emailcollector
2018-11-06 19:49:52 +01:00
François J
f9a8b240ac
Add PredefinedMailContentContact lang string
2018-11-06 15:05:03 +01:00
Laurent Destailleur
4a25317f10
Fix security on GETPOST('action'). Param must be sanitized.
2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e
FIX sanitize param $action
2018-11-05 17:53:31 +01:00
Laurent Destailleur
dd70f1bf08
Debug emailcollector
2018-11-05 16:59:40 +01:00
Laurent Destailleur
6b89bc4ecc
Merge pull request #9937 from aspangaro/9.0_FEC
...
Debug asset module
2018-11-05 09:36:42 +01:00
Laurent Destailleur
67fbb3dbb6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/class/notify.class.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-11-03 19:15:52 +01:00
Laurent Destailleur
68ec172798
Fix setup to enable reminder b email
2018-11-03 12:37:52 +01:00
Alexandre SPANGARO
8d8023b405
Debug asset module
2018-11-01 22:32:33 +01:00
Laurent Destailleur
c9ef298839
Fix setup template emails
2018-10-31 11:38:04 +01:00
Philippe GRAND
fe6b185bf1
Typo
2018-10-31 10:32:40 +01:00
Laurent Destailleur
3d16b05fdb
Fix fetch
2018-10-30 21:30:44 +01:00
Laurent Destailleur
68f6ebd0ff
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/lib/security.lib.php
htdocs/modulebuilder/template/myobject_card.php
2018-10-30 14:47:39 +01:00
Laurent Destailleur
af9b8f033a
Click to refresh
2018-10-28 17:23:42 +01:00
Maxime Kohlhaas
46d3bec104
Fix replenish wasn't caring about supplier price min quantity #9561
2018-10-28 10:25:56 +01:00
Laurent Destailleur
d3893b8b95
Debug v9
2018-10-26 19:00:24 +02:00
Laurent Destailleur
0ba86d4e5b
Trans
2018-10-26 12:22:31 +02:00
Laurent Destailleur
8b601bd7fd
Fix numbering of holidays
2018-10-25 18:50:53 +02:00
Laurent Destailleur
1ba716b82c
Fix do not allow use of second or third tax without using 1st one.
2018-10-25 14:39:54 +02:00
Laurent Destailleur
25a374bd9a
NEW Notification module support expense report+holiday validation and
...
approval event.
2018-10-25 12:45:13 +02:00
Laurent Destailleur
24f37c7bd7
CSS
2018-10-24 12:12:06 +02:00
Laurent Destailleur
36323752ed
Project must be on a dedicated field
2018-10-24 12:00:54 +02:00
Laurent Destailleur
c2c4366c62
Removed duplicate translation
2018-10-24 11:38:16 +02:00
Laurent Destailleur
612e3a9805
Merge branch '9.0_accountancy' of https://github.com/aspangaro/dolibarr
...
into aspangaro-9.0_accountancy
# Conflicts:
# htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
# htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
# htdocs/accountancy/class/lettering.class.php
2018-10-24 02:54:57 +02:00
atm-quentin
96d0bb8f2e
FIX adapt develop
2018-10-23 14:31:58 +02:00
Juanjo Menent
e40ee879dc
New: works with variants:
...
- If product is variant disable prices modify
- Add function isVariant for knowing if product is a Variant
2018-10-23 13:07:09 +02:00
atm-quentin
8442b405b2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception
2018-10-23 10:27:46 +02:00
atm-quentin
0a033f4cfd
FIX : manage error
2018-10-22 16:49:36 +02:00
root
0c61162698
fix langs workflow reception
2018-10-22 14:56:13 +02:00
Alexandre SPANGARO
5cbcef4465
Debug Lettering
2018-10-20 08:26:30 +02:00
Alexandre SPANGARO
d3856d9289
Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy
2018-10-20 06:35:39 +02:00
Laurent Destailleur
fecb6e49c6
Merge pull request #9014 from atm-john/NEW_PDF_DOCUMENT_COLUMN_new_files
...
Experimental new pdf documents using new column system
2018-10-19 15:51:54 +02:00
Laurent Destailleur
6d1a934e8d
Merge pull request #9792 from atm-greg/Disable_customerprospect_thirdparty_type
...
NEW Add configuration to disable "customer/prospect" thirdparty type
2018-10-19 13:47:33 +02:00
Laurent Destailleur
c1d2556965
Update admin.lang
2018-10-19 13:47:18 +02:00
atm-quentin
cfba5a5e0f
fix when model mail selected
2018-10-18 17:02:20 +02:00
Laurent Destailleur
548fafc6e9
Fix trans
2018-10-18 01:32:06 +02:00
Laurent Destailleur
b2a7845c8a
Fix trans
2018-10-18 01:28:14 +02:00
Laurent Destailleur
63f4704725
Fix translation
2018-10-18 01:05:10 +02:00
atm-greg
d86c44e641
Add conf to disable a thirdparty type
2018-10-17 15:55:46 +02:00
atm-quentin
236a61ab55
new manage correctly create bills on reception
2018-10-17 11:56:32 +02:00
Alexandre SPANGARO
a5ebcff2ee
Fix lettering function
2018-10-16 22:27:34 +02:00
Laurent Destailleur
d43e1fcef6
Merge pull request #9729 from simnandez/develop
...
New: works with variants
2018-10-16 20:08:17 +02:00
Laurent Destailleur
2c1e8d6535
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/expedition/class/expeditionbatch.class.php
htdocs/public/payment/newpayment.php
htdocs/stripe/config.php
2018-10-16 18:47:11 +02:00
Laurent Destailleur
502c52b78f
Show real path of module if not into custom
2018-10-16 18:09:43 +02:00
Laurent Destailleur
4bdcb17694
Trans
2018-10-16 15:38:26 +02:00
atm-quentin
f11e1940fc
NEW mass action list reception create bills for validated reception
2018-10-16 12:05:28 +02:00
Laurent Destailleur
35f9371343
Fix missing es translation string
2018-10-16 03:30:17 +02:00
atm-quentin
83c8a78628
NEW auto event msg
2018-10-15 17:08:28 +02:00
Juanjo Menent
e3643c7ab7
Merge remote-tracking branch 'upstream/develop' into develop
2018-10-15 11:44:50 +02:00
Laurent Destailleur
0a8f305151
Trans
2018-10-15 02:40:49 +02:00
Laurent Destailleur
b0569de166
Work on multilang support
2018-10-14 18:44:29 +02:00
Laurent Destailleur
abf8867061
Merge pull request #8207 from atm-john/New_invoice_default_documents
...
NEW hidden option to define an invoice template for each invoice type
2018-10-14 16:36:37 +02:00
Maxime Kohlhaas
9be8c579d0
New massaction to generate PDF
2018-10-14 15:50:55 +02:00
Laurent Destailleur
26c9158ed7
Label of DPO
2018-10-14 14:20:28 +02:00
Laurent Destailleur
8a928a72fa
Sync transifex
2018-10-13 14:03:32 +02:00
Laurent Destailleur
31152e10f6
Trans
2018-10-13 13:27:59 +02:00
Laurent Destailleur
ef820e4c55
Merge pull request #9726 from fgarcia78/develop
...
FIX translatable field name in stock movement table
2018-10-12 17:52:52 +02:00
Laurent Destailleur
ded5c4c3dd
Social network module
2018-10-12 11:02:03 +02:00
Juanjo Menent
ab55ff2e2c
New: works with variants:
...
- Make the checkbox working correctly
2018-10-11 15:44:23 +02:00
atm-quentin
83e4d6bd13
NEW export reception
2018-10-11 15:28:28 +02:00
atm-quentin
4b23b46e48
NEW workflow set reception billed on validate supplier bill
2018-10-11 14:49:19 +02:00
Fernando Octavio García López
c7eb935cb8
FIX Fixed translatable field name in stock movement table
2018-10-10 22:57:08 -06:00
Laurent Destailleur
6c55bfc0f7
Fix export and remove duplicate csv export.
2018-10-10 19:45:26 +02:00
Laurent Destailleur
619ac9c7cf
Fix help
2018-10-10 18:42:53 +02:00
Laurent Destailleur
cb29209457
NEW Enhancement in process to make manual bank conciliation
2018-10-10 12:47:18 +02:00
atm-quentin
489ccc3c49
NEW list and fix conf
2018-10-10 12:19:57 +02:00
Laurent Destailleur
8f4b74733c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2018-10-10 01:51:54 +02:00
Laurent Destailleur
414876e25e
More complete message
2018-10-10 01:46:43 +02:00
Laurent Destailleur
2539f0047f
FIX Sending of reminder for expired subscriptions
2018-10-09 23:10:39 +02:00
Laurent Destailleur
dfe9c05d2f
Merge menu entry for tags/categories as submenu of element.
2018-10-09 15:26:15 +02:00
Laurent Destailleur
0938ac4afa
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/user/list.php
2018-10-09 14:54:18 +02:00
Laurent Destailleur
3c8b365c3e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-09 14:53:39 +02:00
Laurent Destailleur
9bea9edfd7
FIX Menu to show/edit Users categories was missing
2018-10-09 14:41:21 +02:00
Laurent Destailleur
a2a53a32f1
FIX Look and feel v8. Missing button "Create category"
2018-10-09 14:34:25 +02:00
Laurent Destailleur
4d959bbea7
Fix consistency of label of proposal status
2018-10-09 14:06:45 +02:00
Laurent Destailleur
94743d50be
Merge pull request #9707 from aspangaro/9.0_FEC
...
NEW Add FEC Export in accountancy
2018-10-09 13:05:20 +02:00
Laurent Destailleur
398603c789
Merge pull request #9696 from IAS-SYSTEMS-CSC/develop
...
new malay lang tag
2018-10-09 12:40:26 +02:00
atm-quentin
9f56540e75
NEW actions buttons done with stock movement
2018-10-09 11:33:41 +02:00
Laurent Destailleur
1c74dcc270
NEW Can filter on EEC, not EEC, etc... in binding step of accountancy
2018-10-09 01:47:37 +02:00
Alexandre SPANGARO
75b9862c14
New : Add FEC Export in accountancy
2018-10-08 21:01:21 +02:00
Laurent Destailleur
923b561aff
FIX Option for prof id mandatory not working with custom type of company
2018-10-08 20:01:45 +02:00
Laurent Destailleur
7be9b6d94e
Fix translation of source of proposals
2018-10-08 14:04:22 +02:00
atm-quentin
095d851e79
FIX affichage ligne reception
2018-10-08 12:15:17 +02:00
ias-ceo
de17977bff
new malay lang tag
2018-10-06 15:09:06 +03:00
atm-quentin
6a8092dfae
NEW entete reception card
2018-10-05 16:21:50 +02:00
Laurent Destailleur
f154139a0e
Reduce length of tab title "Bank"
2018-10-04 20:22:25 +02:00
Laurent Destailleur
b52a38bcd2
Trans
2018-10-04 17:59:34 +02:00
Laurent Destailleur
3b7af822db
Merge pull request #9663 from frederic34/patch-18
...
add missing translation key found in box graph
2018-10-04 17:26:42 +02:00
Laurent Destailleur
111d589474
NEW Can mix offset before and after with rules for due date of invoices
2018-10-04 16:06:26 +02:00
atm-quentin
5fe767d7bd
debut card create
2018-10-04 12:27:10 +02:00
Laurent Destailleur
402175bb49
Work on multilang
2018-10-03 19:53:33 +02:00
atm-quentin
52717dbb65
NEW debut rename stock conf
2018-10-03 18:05:22 +02:00
Laurent Destailleur
8ee98315c7
Lang
2018-10-03 13:13:16 +02:00
atm-quentin
41d8cb87a3
debut reception setup page
2018-10-03 12:22:41 +02:00
Frédéric FRANCE
a722e98d8d
add missing translation key found in box graph
2018-10-02 21:20:04 +02:00
atm-quentin
baed678b6e
NEW shipping set draft and update line
2018-10-02 15:49:31 +02:00
Laurent Destailleur
771922f427
Use 2 distinct left menu entries for leads and projects
2018-10-01 18:56:47 +02:00
Laurent Destailleur
aaa5efc77e
Clean Take pos module
2018-09-28 22:06:04 +02:00
Laurent Destailleur
f990719daa
Add experimental module TakePOS
2018-09-28 13:31:41 +02:00
Laurent Destailleur
3f3c8aeb26
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-28 02:23:20 +02:00
Laurent Destailleur
c07ab81e6a
Fix trans
2018-09-28 02:22:23 +02:00
Laurent Destailleur
851fd4cc18
NEW Can set the default focus of each page.
...
NEW Can set if a field is mandatory on form level.
2018-09-28 00:52:15 +02:00
Laurent Destailleur
a623d80830
Work on mandatory form fields
2018-09-27 16:38:18 +02:00
Laurent Destailleur
26d20d0b76
Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price
...
NEW Advanced permission to ignore price min
2018-09-27 09:57:49 +02:00
Laurent Destailleur
6680fca6c6
Add missing translation key
2018-09-27 09:13:28 +02:00
Laurent Destailleur
ba3ca550ce
Fix date in text for substitution. Removed not used translation keys.
2018-09-25 11:36:40 +02:00
Laurent Destailleur
bd523973d8
Add missing translation key
2018-09-25 00:55:03 +02:00
Laurent Destailleur
9dc4ad4cc3
Add warning when using editinline
2018-09-24 15:38:13 +02:00
Laurent Destailleur
5c0e6eacf6
Use latest instead of last
2018-09-24 10:43:12 +02:00
Laurent Destailleur
26d585ffbe
Use latest instead of last
2018-09-24 10:43:01 +02:00
Laurent Destailleur
ad6895aa2e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-24 10:23:09 +02:00
Laurent Destailleur
57e359cd40
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/agenda.lang
2018-09-24 10:18:13 +02:00
Laurent Destailleur
dbb75e35a1
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/agenda.lang
2018-09-24 10:14:38 +02:00
Laurent Destailleur
2dbb82fc76
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-09-24 10:03:21 +02:00
Laurent Destailleur
12690666e2
Missing trans
2018-09-24 10:03:08 +02:00
Laurent Destailleur
48ca7e4603
Typo
2018-09-23 15:47:13 +02:00
Laurent Destailleur
8aa22f2c33
NEW Add option to swap sender/recipient address on PDF
2018-09-23 14:57:44 +02:00
Laurent Destailleur
ac8f82338e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-21 11:12:27 +02:00
Laurent Destailleur
a078951a94
Add an help for user to avoid bad configuration
2018-09-21 11:12:08 +02:00
Laurent Destailleur
8cfe5d7252
Merge pull request #9569 from grandoc/new_branch_19_09_2018
...
Missing translation
2018-09-21 09:50:18 +02:00
Laurent Destailleur
5bd538fb2c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/modules/modStripe.class.php
htdocs/filefunc.inc.php
htdocs/projet/element.php
2018-09-20 23:43:34 +02:00
Laurent Destailleur
36b8958c59
Move Stripe menu transactions and charges from develop to experimental
2018-09-20 19:35:13 +02:00
Laurent Destailleur
6793285997
Website
2018-09-20 14:38:18 +02:00
Laurent Destailleur
6e95fb5f05
Warning in website module
2018-09-20 14:36:13 +02:00
Laurent Destailleur
55e3d97842
Trans
2018-09-19 17:56:51 +02:00
Laurent Destailleur
09a41fd757
Look and feel v8
2018-09-19 17:33:50 +02:00
Philippe GRAND
c9b8da8acb
Missing translation
2018-09-19 16:06:39 +02:00
gauthier
d62118dca8
FIX : langs fr
2018-09-19 14:53:56 +02:00
Laurent Destailleur
7ca6b2603c
Trans
2018-09-19 12:25:07 +02:00
Laurent Destailleur
d35687c8b3
Work on module social network
2018-09-19 01:45:56 +02:00
Laurent Destailleur
014da6c22c
Fix translation
2018-09-18 18:11:07 +02:00
John BOTELLA
3fb2d4c159
remove change on text
2018-09-18 15:52:57 +02:00
Laurent Destailleur
1a1219ee2a
Trans
2018-09-18 14:52:50 +02:00
Laurent Destailleur
e07ce644e8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/langs/en_US/admin.lang
2018-09-18 11:49:35 +02:00
Laurent Destailleur
1e36aba35f
Trans
...
Conflicts:
htdocs/langs/en_US/admin.lang
2018-09-17 16:42:44 +02:00
Laurent Destailleur
d717e28338
Trans
2018-09-17 14:15:30 +02:00
Laurent Destailleur
f3ce7cb5a5
Quick hack to provide help to fix pb of undesirable files
2018-09-17 10:40:42 +02:00
Laurent Destailleur
ab0f842db6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-16 12:55:44 +02:00
Laurent Destailleur
74a9c680df
FIX "Other ..." link so the "Back to" link works.
2018-09-16 12:27:56 +02:00
Laurent Destailleur
eebd329c7c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/DolibarrModules.class.php
htdocs/core/modules/modAgenda.class.php
htdocs/core/modules/modFacture.class.php
htdocs/langs/en_US/admin.lang
htdocs/langs/en_US/main.lang
htdocs/stripe/transaction.php
2018-09-16 09:50:13 +02:00
Laurent Destailleur
f88dba91ab
Trans
2018-09-15 14:15:21 +02:00
John BOTELLA
ec23cd0da4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_PDF_DOCUMENT_COLUMN_new_files
2018-09-14 09:54:14 +02:00
Laurent Destailleur
765d8ec1fe
Better description
2018-09-12 21:33:48 +02:00
Laurent Destailleur
f46a137e25
Better description
2018-09-12 21:32:58 +02:00
Laurent Destailleur
c5e30b61c0
Fix translation
2018-09-12 21:25:14 +02:00
Laurent Destailleur
3dca02d25b
Fix translation
2018-09-12 21:07:34 +02:00
Laurent Destailleur
9d9e2bc3e3
Merge pull request #9405 from fmarcet/develop
...
NEW: Highlight lines on lists when they are checked
2018-09-12 20:50:42 +02:00
Laurent Destailleur
88192d1bae
Merge pull request #9456 from frederic34/stripeuser
...
add stripe user for actions
2018-09-12 18:37:31 +02:00
Laurent Destailleur
e89ff94d74
Update stripe.lang
2018-09-12 18:35:47 +02:00
Laurent Destailleur
f5074f4962
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 18:12:17 +02:00
Laurent Destailleur
77d7c97750
Fix typo
2018-09-12 17:18:27 +02:00
Laurent Destailleur
48ae4de47b
FIX Add paypal error message in alert email
2018-09-12 16:11:10 +02:00
Laurent Destailleur
fcabe67e4b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 13:30:28 +02:00
Frédéric FRANCE
5f1b3fbc12
add stripe user for actions
2018-09-10 20:18:16 +02:00
Laurent Destailleur
3de8381c20
Website module
2018-09-10 19:36:46 +02:00
Laurent Destailleur
538a2cc647
NEW Add first template of website
2018-09-08 13:55:15 +02:00
Laurent Destailleur
a2b71d9a7a
NEW Can delete a website in experimental website module
2018-09-08 12:04:40 +02:00
Laurent Destailleur
0ef17fe581
FIX Problems with permissions of module to record payment of salaries
2018-09-07 13:32:56 +02:00
Laurent Destailleur
c5695db3e4
NEW Can disable meteo on smartphone only
2018-09-06 11:09:51 +02:00
Laurent Destailleur
4ac67e6409
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-05 20:31:10 +02:00
Laurent Destailleur
e3339f5f95
Fix trad
2018-09-05 19:01:00 +02:00
Laurent Destailleur
ab8155f170
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
2018-09-04 21:35:43 +02:00
Ferran Marcet
b658626e21
NEW: Highlight lines on lists when they are checked
2018-09-04 11:54:13 +02:00
Laurent Destailleur
9697bdf3b0
FIX #9393 inconsistency behaviour. option FACTURE_ENABLE_NEGATIVE_LINES
2018-09-04 10:38:09 +02:00
Laurent Destailleur
3d3edb19d8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/langs/en_US/commercial.lang
2018-09-02 15:48:26 +02:00
Laurent Destailleur
df26ae764e
Fix typo
2018-09-01 17:56:52 +02:00
Laurent Destailleur
dfda029da4
FIX a removed option was still in setup
2018-09-01 17:44:07 +02:00
Laurent Destailleur
bcee0ef0ae
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/societe/class/societe.class.php
htdocs/stripe/config.php
2018-09-01 14:16:57 +02:00
Laurent Destailleur
26cff9e11f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/langs/en_US/blockedlog.lang
htdocs/stripe/config.php
2018-09-01 14:13:01 +02:00
Laurent Destailleur
4d22c4f9f9
Typo
2018-08-30 11:37:06 +02:00
Frédéric FRANCE
285e231ea1
Update blockedlog.lang
2018-08-29 23:08:13 +02:00
Laurent Destailleur
2cf37f621c
Merge pull request #9267 from torvista/develop
...
Installer: set protocol of autofill of main url to match installer protocol
2018-08-29 21:47:31 +02:00
Laurent Destailleur
3ebfb23407
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/fournisseurs.php
htdocs/ticket/class/ticket.class.php
2018-08-29 20:22:50 +02:00
Laurent Destailleur
1b542d5be3
Fix translation
2018-08-28 18:36:46 +02:00
Laurent Destailleur
b5c2383f65
Fix type of invoice encoded twice
2018-08-28 18:34:53 +02:00
Laurent Destailleur
d2d28ab109
Fix trans
2018-08-28 18:28:09 +02:00
Laurent Destailleur
bc31fa7fbf
Fix translation
2018-08-28 18:18:04 +02:00
Laurent Destailleur
bbc6255925
Fix missing language
2018-08-28 13:07:48 +02:00
Steve
6ecc6b8b48
Merge pull request #1 from Dolibarr/develop
...
update fork
2018-08-28 00:10:26 +02:00
Laurent Destailleur
36c7007aaa
Add control to avoid duplicate aliases
2018-08-20 19:10:33 +02:00
Laurent Destailleur
26d34422b0
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-19 03:01:26 +02:00
Laurent Destailleur
cca0f4bf22
Fix translation
2018-08-19 02:01:18 +02:00
Laurent Destailleur
38f3452f0c
Fix trans
2018-08-19 01:51:45 +02:00
torvista
710ce6a9f7
Add description to database prefix field to avoid confusion when not specifying a database prefix.
2018-08-19 00:09:34 +02:00
Laurent Destailleur
9a82cc3261
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-18 02:55:49 +02:00
Laurent Destailleur
dedfd6d493
Fix missing translation
2018-08-18 02:55:22 +02:00
Laurent Destailleur
ab22c9d0de
Work on import
2018-08-16 21:48:16 +02:00
Laurent Destailleur
4e02b134da
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-08-16 14:50:04 +02:00
Laurent Destailleur
9f5cc2d05f
Fix menu entry
2018-08-16 10:33:20 +02:00
Laurent Destailleur
1922c3d881
Fix menu entry
2018-08-16 10:32:42 +02:00
Laurent Destailleur
2a69fa39d6
error message
2018-08-16 00:18:08 +02:00
Laurent Destailleur
4610b193bb
Add error message
2018-08-16 00:13:13 +02:00
Laurent Destailleur
ae9867eead
Work on website import
2018-08-16 00:03:19 +02:00
Laurent Destailleur
ec56ad752c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-08-15 14:26:38 +02:00
Laurent Destailleur
b88c657a4a
Work on website import
2018-08-15 14:24:33 +02:00
Laurent Destailleur
df57bd176b
Fix translation
2018-08-13 14:53:04 +02:00
Laurent Destailleur
9fc5d39d07
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:22 +02:00
Laurent Destailleur
1b20d6feab
Merge pull request #9214 from atm-greg/Add_supplier_product_description
...
NEW Can record the supplier product description
2018-08-12 18:56:27 +02:00
John BOTELLA
6fad0ea5bd
Add retained warranty to pdf
2018-08-10 16:03:39 +02:00
John BOTELLA
d6d8f98f38
add retained warranty cond field and add forms
2018-08-10 15:06:00 +02:00
Laurent Destailleur
2dbb6e258b
FIX Can filter on month in export of blockedlog
...
FIX Fingerprint correct in popup
2018-08-09 22:29:02 +02:00
John BOTELLA
06be98c638
add date field
2018-08-08 17:36:39 +02:00
John BOTELLA
3036c94198
Add new situation retained warranty field
2018-08-07 15:18:42 +02:00
atm-greg
ad5f59822e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
2018-08-07 09:33:30 +02:00
atm-greg
fc705e8510
Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
2018-08-07 09:31:41 +02:00
atm-greg
a8b33a1710
New fields desc_supplier on product_fourn_prices
2018-08-06 16:26:25 +02:00
florian HENRY
45a52a955e
NEW: Add optoin to display thirdparty adress in combolist
2018-08-06 10:52:10 +02:00
Juanjo Menent
788060aa28
Merge pull request #9178 from aspangaro/9.0_a3
...
NEW : Add project on salaries
2018-08-02 11:19:34 +02:00
Alexandre SPANGARO
0509a176ca
Merge branch 'develop' into 9.0_a3
2018-07-31 07:47:43 +02:00
Alexandre SPANGARO
b0e2e69ed0
New : Add project on salaries
2018-07-31 07:45:03 +02:00
Frédéric FRANCE
2dd907a8e1
extrafield totalizable
2018-07-26 09:41:44 +02:00
Laurent Destailleur
e024ea9c05
Merge pull request #9146 from grandoc/new_branch_24_07_2018
...
Clean and update code
2018-07-24 21:41:12 +02:00
Laurent Destailleur
dc2fec8f57
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-24 19:37:04 +02:00
Philippe GRAND
2a6f050e32
Clean and update code
2018-07-24 18:28:56 +02:00
Chl
4995a0feb1
Translation: adding 'Enable' term in main
...
compta/facture/fiche-rec.php uses 'Enable' / 'Disable' in a button text
but no translation is available for 'Enable'.
Another option would be to change 'Enable' to 'Activate' in
fiche-rec.php but I guess this word will probably be useful in other
places.
2018-07-24 00:38:48 +02:00
Laurent Destailleur
df7a3598a8
Trans
2018-07-23 10:56:28 +02:00
Laurent Destailleur
2c7029850a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/website.lib.php
htdocs/website/index.php
2018-07-21 20:28:26 +02:00
Laurent Destailleur
f419964c76
Fix Debug website module
2018-07-20 15:01:50 +02:00
Laurent Destailleur
8247bb683c
Debug website module
2018-07-19 21:35:21 +02:00
Laurent Destailleur
7273cb97b2
Fix trans
2018-07-18 14:32:51 +02:00
Laurent Destailleur
19bb8a5091
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/accountancy.lang
2018-07-18 14:12:28 +02:00
Laurent Destailleur
6ad0cd37b0
Translation
2018-07-18 11:57:49 +02:00
Laurent Destailleur
4b044779dc
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-17 22:31:58 +02:00
Laurent Destailleur
969aea98e1
Fix label of copy must not be same
2018-07-17 22:31:28 +02:00
Laurent Destailleur
651ba74007
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-16 15:45:50 +02:00
Laurent Destailleur
37e16b5ff2
Trans
2018-07-16 11:55:59 +02:00
Laurent Destailleur
41605ed4a7
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-07-16 11:29:47 +02:00
Laurent Destailleur
d3cc2c81eb
Better detail for time elapsed
2018-07-16 11:14:39 +02:00
Laurent Destailleur
89cc048fff
FIX Init of contact in combo list when thirdparty not yet known
2018-07-16 10:46:10 +02:00
Laurent Destailleur
3710f95719
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/exports.lang
2018-07-16 10:01:23 +02:00
Steve
2cf28e055b
more minor grammar corrections
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/langs/en_US/companies.lang
htdocs/langs/en_US/exports.lang
htdocs/langs/en_US/mails.lang
htdocs/langs/en_US/products.lang
htdocs/langs/en_US/sms.lang
2018-07-16 09:43:19 +02:00
Laurent Destailleur
ae76e61885
Merge pull request #9108 from torvista/misc-texts
...
more minor grammar corrections
2018-07-16 09:23:10 +02:00
Steve
bd9149e03b
more minor grammar corrections
2018-07-16 07:28:22 +02:00
Laurent Destailleur
a45ac4519a
Fix translation
2018-07-15 18:03:31 +02:00
Laurent Destailleur
e4be3ab954
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-13 09:09:51 +02:00
Laurent Destailleur
4c363d1d4f
Trans
2018-07-10 15:08:51 +02:00
Laurent Destailleur
64517d4c0b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/langs/en_US/admin.lang
2018-07-10 14:06:51 +02:00
Laurent Destailleur
5f52dfa873
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-10 14:02:40 +02:00
Laurent Destailleur
c01975a40b
Merge pull request #9084 from torvista/texts-setup-en_US
...
Texts corrections /langs/en_US
2018-07-10 10:41:28 +02:00
Laurent Destailleur
bd1e430a28
Synch transifex
2018-07-09 20:15:14 +02:00
Steve
e45e74a3bd
spelling and some grammar corrections to en_US
2018-07-09 17:38:28 +02:00
Laurent Destailleur
e0c3d176ed
Merge pull request #9067 from torvista/install-texts-en_US
...
spelling and some grammar corrections for installation texts en_US
2018-07-09 17:11:58 +02:00
Laurent Destailleur
291f149a9b
NEW Can set a tooltip help text on extrafields
2018-07-08 20:26:48 +02:00
Laurent Destailleur
41f21f3867
Translation
2018-07-08 20:06:24 +02:00
Laurent Destailleur
8ec9257302
Fix translation
2018-07-08 20:03:14 +02:00
Steve
5944c161bc
spelling and some grammar corrections for installation texts en_US
2018-07-07 08:41:17 +02:00
Laurent Destailleur
303fb94acb
Fix trans
2018-07-06 13:04:37 +02:00
Laurent Destailleur
fb84211714
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-06 12:45:44 +02:00
Laurent Destailleur
6c5264fabb
Fix label
2018-07-06 12:45:20 +02:00
Laurent Destailleur
2a8f98be65
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-03 12:48:26 +02:00
Laurent Destailleur
da7b433cd0
Trans
2018-07-03 12:46:22 +02:00
Laurent Destailleur
12c43d7722
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-03 12:33:17 +02:00
Laurent Destailleur
01e8f78c30
Trans
2018-07-03 09:58:36 +02:00
Laurent Destailleur
9c5d34fc5f
Fix translation
2018-07-02 12:26:32 +02:00
Laurent Destailleur
63f3143718
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-02 12:18:34 +02:00
Laurent Destailleur
7bf33b1bac
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/hrm/index.php
htdocs/install/mysql/tables/llx_website_account.key.sql
htdocs/modulebuilder/template/myobject_card.php
2018-07-02 12:16:51 +02:00
Laurent Destailleur
af21222c30
Fix translation
2018-07-02 11:47:04 +02:00
