Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
59,869 Commits 36 Branches 189 Tags
69b26dcb4ebea5a36cd6dcfb9fbf4ced48a910de
Commit Graph

448 Commits

Author SHA1 Message Date
Laurent Destailleur
8149bf62a8 Fix ajaxcombo broken on accouting account edition on vat dictionary. 2017-06-15 23:47:19 +02:00
Laurent Destailleur
58c4144123 Fix sort of dictionnary 2017-06-11 19:27:07 +02:00
Laurent Destailleur
7c0de18ac1 Fix code comment 2017-06-10 12:56:28 +02:00
Regis Houssin
2b36135641 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc
 2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175 Maxi debug of v6 2017-06-07 19:28:31 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Alexandre SPANGARO
1f079fac9d Move html.formventilation.class.php to html.formaccounting.class.php 2017-05-25 06:57:28 +02:00
Laurent Destailleur
80cbc28385 NEW Add REST API to push a file. 2017-05-20 15:52:36 +02:00
Laurent Destailleur
b35b40e2bf Align position of right 2017-05-19 17:08:42 +02:00
Laurent Destailleur
f65b29c135 FIX #6867 - Rewrite code to solve regression (not mixing array/string 
type and solve php warnings). Also restore $langs as a global var.
 2017-05-19 16:57:38 +02:00
KHELIFA
2382a0a4ee Core dictionaries: Adds the ability to change the color and position of the dictionary 'Types of agenda events' 2017-05-19 10:46:29 +02:00
Alexandre SPANGARO
93554b7e30 Typo searchpicto 2017-05-14 21:06:33 +02:00
Laurent Destailleur
553f5b990c Fix scrutinizer errors 2017-05-13 18:50:55 +02:00
Laurent Destailleur
9641a240ea Complete vat dictionnary 2017-05-02 11:27:35 +02:00
Laurent Destailleur
60951cf307 Less data example 2017-04-30 04:09:50 +02:00
Laurent Destailleur
2e6d865c7d NEW Can define default values for create forms. 
NEW Can define default filters for list pages.
NEW Can define default sort order for list pages.
 2017-04-29 00:44:25 +02:00
Laurent Destailleur
cfde27820e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
	htdocs/comm/card.php
	htdocs/core/menus/standard/eldy.lib.php
 2017-04-27 17:20:40 +02:00
Laurent Destailleur
113d4d1665 FIX spaces not allowed into vat code 2017-04-25 10:29:13 +02:00
Laurent Destailleur
b0442aa56a Better explanation on label that are translated. 2017-04-14 19:48:01 +02:00
Laurent Destailleur
e2c31b5f23 Fix regression 2017-04-14 18:43:34 +02:00
Laurent Destailleur
db73eeba5c NEW Can filter on code in dictionnaries 2017-04-14 16:31:16 +02:00
Laurent Destailleur
846204bdb4 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
2446cb5431 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/facture.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/contact/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/facture/card.php
	htdocs/societe/list.php
	htdocs/user/document.php
 2017-04-11 11:43:54 +02:00
Marcos García de La Fuente
da0af36086 FIX #6671 Cannot remove thirdparty type with "#" in its name 
Close #6671
 2017-04-09 14:51:15 +02:00
Laurent Destailleur
3adb43c6e5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/boxes/box_produits.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/langs/en_US/bills.lang
	htdocs/product/class/product.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2017-03-23 12:52:19 +01:00
Laurent Destailleur
967f3f579d Fix translation 2017-03-18 20:07:37 +01:00
BENKE Charlie
a2611e31fe add selectform choice for private mailing 
better usability than enter 0 ou 1 value
 2017-02-24 11:12:14 +01:00
Laurent Destailleur
eef3824f8c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/categories.php
	htdocs/admin/dict.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/bills.lang
 2017-02-21 10:34:52 +01:00
Laurent Destailleur
89d10ae5aa Fix the accounting account groups must be editable by book keeper, not 
admin user.
 2017-02-20 11:21:38 +01:00
Laurent Destailleur
d4fd9bd71e Merge pull request #6414 from laudeco/fix/dictionnary_without_rowid 
[FIX] Dictionaries without rowid
 2017-02-12 20:46:43 +01:00
Laurent Destailleur
05c9f57fd4 Move edition of emails templates out of dictionaries so we would be able 
to have templates per user (not reserved to admin).
 2017-02-12 18:13:49 +01:00
De Coninck Laurent
4fb4bc6f6c [FIX] Dictionnaries without rowid 
It's possible to create a dictionnary without the key rowid.
But in that case it's impossible to enable/disable the value because the dictionnary fonctionality uses always rowid even another primary key is defined.

By this fix, the id property uses is the primary key defined on the dictionnary creation.
 2017-02-10 10:29:08 +01:00
Laurent Destailleur
29df2c9115 Merge branch 'develop' into mail-lines 2017-01-27 01:29:58 +01:00
BENKE Charlie
e701ea0b2f Add dictionnary mail for contract 2017-01-16 14:06:34 +01:00
Ion Agorria
522fb4cf7a Add email template for each line in object 2016-12-31 17:39:01 +01:00
Laurent Destailleur
7e2b41402e Fix bad balance of form 2016-12-23 16:24:07 +01:00
Laurent Destailleur
5187ffcc9a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-12 13:03:37 +01:00
Laurent Destailleur
4e86e59fb3 Fix responsive 2016-12-12 13:02:54 +01:00
Laurent Destailleur
7077b4931c Add dump v5 2016-12-12 11:57:50 +01:00
tarrsalah
eb6620f6f6 fix (#6158)default localtax1 and localtax2 values. 2016-12-11 17:56:49 +01:00
aspangaro
638563dc5d Fix missing language key in holiday type dictionary 2016-11-22 05:54:44 +01:00
aspangaro
6e66d529f0 Fix missing language key for lead status dictionary 2016-11-22 05:33:33 +01:00
aspangaro
38a31cbd28 Fix missing key language in dictionary email models 2016-11-22 05:25:08 +01:00
aspangaro
213e7d1cd7 Fix Missing language key for dictionary format card 2016-11-21 21:49:08 +01:00
Laurent Destailleur
b44c746c2e Fix table disabled 2016-11-13 18:31:22 +01:00
Laurent Destailleur
a658b7cc3d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/card.php
 2016-10-31 21:31:57 +01:00
Laurent Destailleur
ffe4ae5915 Fix php7 compatibility 2016-10-31 21:24:23 +01:00
Laurent Destailleur
f0365e49e2 Fix book keeper can edit accounting account of taxes 2016-10-21 18:05:26 +02:00
Laurent Destailleur
9eafff4a97 Debug module accounting 2016-10-21 17:41:05 +02:00