Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-29 04:41:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
52,451 Commits 36 Branches 191 Tags
db656ea4cab97cd0eb39b2cc5e5b6cab753d98eb
Commit Graph

337 Commits

Author SHA1 Message Date
Laurent Destailleur
3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
 2016-03-02 23:40:11 +01:00
Laurent Destailleur
846d78dfba FIX Edition of delay (nb of days) for payment term "Immediate" was 
broken.
 2016-02-29 15:43:00 +01:00
Laurent Destailleur
1fa94e4d6a NEW Introduce position of records into dictionnary of type of contacts 2016-02-26 15:03:07 +01:00
Laurent Destailleur
7765e37101 Better support of option SOCIETE_SORT_ON_TYPEENT 2016-02-19 21:09:36 +01:00
Laurent Destailleur
7aaae143fc Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/expedition/card.php
 2016-02-15 02:01:58 +01:00
Raphaël Doursenaud
d038ca1875 FIX #4597 PHP 7 Uniform Variable Syntax 
PHP7 compatibility with the new Uniform Variable Syntax.
This change is compatible with both PHP 5 and PHP 7.
See: https://wiki.php.net/rfc/uniform_variable_syntax#backward_incompatible_changes
 2016-02-11 20:01:51 +01:00
frederic34
9c74af63af Dictionnary for label sticker and card format 2016-02-06 12:06:05 +01:00
Laurent Destailleur
c4d8c20abb Fix missing include 2016-01-30 14:32:20 +01:00
Laurent Destailleur
93b2013aa7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/projet/tasks/list.php
 2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/societe/index.php
 2016-01-22 03:25:30 +01:00
Laurent Destailleur
cbd01bae49 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/admin/dict.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/societe/index.php
 2016-01-22 03:18:51 +01:00
Laurent Destailleur
7e9ee6f047 Fix include error 2016-01-10 12:51:42 +01:00
Laurent Destailleur
8653e7fa5c Merge remote-tracking branch 'origin/3.9' into develop 2016-01-10 00:12:51 +01:00
Laurent Destailleur
0d8788e552 FIX It was not possible to define if leave type need to be followed by a 
counter or not. Added also a message to ask user to finish setup if no
leave with counter was setup.
 2016-01-09 01:18:53 +01:00
fmarcet
d8360a2a01 FIX: Email templates not compatible with Multicompany 2016-01-07 08:18:36 +01:00
fmarcet
cafe148f72 FIX: Email templates not compatible with Multicompany 2016-01-04 09:12:27 +01:00
fmarcet
cebb996120 FIX: Email templates not compatible with Multicompany 2015-12-29 11:22:18 +01:00
fmarcet
f8e156ea30 FIX: Email templates not compatible with Multicompany 2015-12-29 10:35:10 +01:00
aspangaro
d6b96ec03a Add function length_accountg to dictionary 2015-12-26 08:38:18 +01:00
aspangaro
565040e1bc Accountancy Add a list to select accounting account on dict 2015-12-26 08:19:43 +01:00
Laurent Destailleur
98cd4f8307 Fix message so it is more clear what the feature can do or not. 
Fix list of email templates must be hidden for templates of disabled
modules.
 2015-12-18 12:48:20 +01:00
Laurent Destailleur
cb3765bc92 Debug module Resource 2015-11-22 12:23:10 +01:00
philippe grand
42ed3d2bb7 [Qual] Uniformize code 2015-11-18 16:05:41 +01:00
Laurent Destailleur
6bd6be0912 Debug and rename experimental module "supplier proposal". Still work to 
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
 2015-11-15 19:23:39 +01:00
Laurent Destailleur
01058be44c NEW Introduce a "code" into fiels to describe vat. This will allow to 
suggest different vat lines with same value with ability to
differentiate them.
 2015-11-14 17:53:58 +01:00
Laurent Destailleur
e7554d377f Fix better error message 2015-11-06 19:07:05 +01:00
Frédéric FRANCE
e7ced32245 Fix Can't edit DictionaryRevenueStamp 2015-11-02 20:08:33 +01:00
Frédéric FRANCE
ccb69d313c Fix Can't edit DictionaryRevenueStamp 2015-11-02 18:18:00 +01:00
philippe grand
3767ab437e [Qual] Uniformize code 2015-10-23 12:58:30 +02:00
Laurent Destailleur
9cce56895c Merge branch 'patch-77' of https://github.com/defrance/dolibarr into 
defrance-patch-77

Conflicts:
	htdocs/core/lib/admin.lib.php
 2015-10-22 13:13:02 +02:00
BENKE Charlie
ef79bb3b67 Update dict.php 2015-10-21 05:23:49 +02:00
BENKE Charlie
88ca8d2ace Update dict.php 2015-10-21 05:22:33 +02:00
philippe grand
0e343ae3b2 syntax error 2015-10-08 09:34:02 +02:00
Laurent Destailleur
3f506552e3 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/theme/md_exp/style.css.php
 2015-09-27 21:29:16 +02:00
Laurent Destailleur
c0433928c6 FIX sortder field was missing so manually added values were moved to 
begin.
 2015-09-25 11:28:49 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Laurent Destailleur
313d9ddacd FIX #3534 2015-09-16 22:04:03 +02:00
BENKE Charlie
b4a9a0cafb Allow contact definition on additionnal modules 
If additionnal module use contactelement feature, the module is referenced on element list on contact type
 2015-09-08 13:07:13 +02:00
Laurent Destailleur
d5ed875427 Fix no need the star for this case 2015-08-13 05:23:25 +02:00
Juanjo Menent
c96573dcb4 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-10 20:29:36 +02:00
Juanjo Menent
b3f3cdda3a Merge remote-tracking branch 'origin/3.6' into 3.7 2015-08-10 20:16:05 +02:00
Marcos García de La Fuente
2f921b6431 Fix [ bug #3342 ]: Taxes dictionary page does not accept localized decimals for localtax2 rate 
Close #3342
 2015-08-09 13:46:48 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
Laurent Destailleur
251fedad48 NEW Can edit email template using WYSIWYG editor 2015-07-04 11:57:55 +02:00
Laurent Destailleur
9c80735310 An easier to use dictionary page to edit email template. 
Uniformize look.
 2015-07-04 03:28:52 +02:00
Laurent Destailleur
0ac43211ad NEW: Add help tooltips on fields of dictionary edit pages. 
Fix: visible list of tasks are for opened project only.
 2015-07-04 02:08:06 +02:00
Laurent Destailleur
ae5b779652 Uniformize code 2015-06-30 01:34:17 +02:00
Laurent Destailleur
4f1538f502 Introduce table llx_c_holiday_type 2015-06-21 03:19:15 +02:00
Laurent Destailleur
2c5ef858d0 NEW Filter "active" by default on user list. 
Fix label of permission of project module
 2015-06-20 20:35:57 +02:00
Laurent Destailleur
5e773d4cb6 Work on finishing of style 2015-05-31 01:06:51 +02:00