Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 01:11:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
94,477 Commits 36 Branches 190 Tags
026e4548258febf35c66351c8ff7cb1556db84e7
Commit Graph

10498 Commits

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