lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
88,659 Commits 43 Branches 150 Tags 886 MiB
12.0
Commit Graph

7524 Commits

Author SHA1 Message Date
Laurent Destailleur
45615081ec FIX Bad use/detetion of text/html when forging template email. 2020-05-28 11:41:48 +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
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
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
a78bc86465 Trans 2020-05-20 23:51:46 +02:00
Laurent Destailleur
c4d1db263c Fix end of workflow of MO 2020-05-20 23:15:18 +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
Laurent Destailleur
2ba9d7f288 Fix translation 2020-05-19 21:38:42 +02:00
Laurent Destailleur
b3a17c8da4 Look and feel v12 2020-05-19 04:21:38 +02:00
Laurent Destailleur
756c1fd73d Fix tooltip message 2020-05-18 15:26:04 +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
Laurent Destailleur
ff84fd8118 Fix default language of user. Must separate weblangs and pagelangs. 2020-05-15 19:01:12 +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
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
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
Laurent Destailleur
02ec282812 Typo 2020-05-11 03:34:30 +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
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
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
Laurent Destailleur
9f176c5e2d Fix trans 2020-05-06 01:41:10 +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
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
Laurent Destailleur
e9c60e64d6 Typo 2020-05-02 12:56:22 +02:00
Laurent Destailleur
c2c0e6517f Fix init data of units D and H. 2020-05-01 22:44:46 +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
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
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
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
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
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
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
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