2
0
forked from Wavyzz/dolibarr
Commit Graph

6095 Commits

Author SHA1 Message Date
alexis portable
428e16341c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into FIX_inventory 2017-05-02 22:46:33 +02:00
alexis Algoud
6138d197e4 FIX major issues for inventory
- Move all needed declaration from coreobject to commonobject for
updateCommon, fetchCommon, deleteCommon, createCommon
- Just leave method for child object into coreobject, check later if is
useless
- debug inventory card, PHP 7.0 compatibility
- activate rights for inventory into stock module
- add inventory options into stock admin module
2017-05-02 15:19:55 +02:00
Laurent Destailleur
ad095d7fb2 NEW Can set margins of PDFs 2017-05-02 14:26:51 +02:00
Laurent Destailleur
9641a240ea Complete vat dictionnary 2017-05-02 11:27:35 +02:00
Laurent Destailleur
6e1f825190 Look and feel v6 2017-05-01 13:01:05 +02:00
Laurent Destailleur
a9eeb823bd Fix browser notif 2017-04-30 05:01:53 +02:00
Laurent Destailleur
60951cf307 Less data example 2017-04-30 04:09:50 +02:00
Laurent Destailleur
f5bdfc426f Merge pull request #6584 from atm-ph/NEW_inventory_coreobject_listview
New inventory coreobject listview
2017-04-29 21:31:46 +02:00
Laurent Destailleur
a8c775dcbd Fix compatibility with the removal of "constant". 2017-04-29 18:48:30 +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
phf
8219ff84c8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview 2017-04-28 14:45:04 +02:00
Laurent Destailleur
676ff84a4e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-04-28 14:05:42 +02:00
Laurent Destailleur
defce63a24 Work on management of default values 2017-04-28 14:05:28 +02:00
Laurent Destailleur
0ba6433a61 Work on module website 2017-04-28 13:10:08 +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
5e856e6923 More complete tooltip help to describe available substitution vars 2017-04-27 17:16:19 +02:00
Laurent Destailleur
1a98c4a3ff Fix error management in adding translation key 2017-04-27 12:48:13 +02:00
Laurent Destailleur
aa4b967e17 FIX image of rss when link is relative
Fix regression after disabling constant init.
2017-04-26 11:46:12 +02:00
philippe grand
e2dbcb2b5a Update code using new css class 2017-04-25 11:59:18 +02:00
Laurent Destailleur
113d4d1665 FIX spaces not allowed into vat code 2017-04-25 10:29:13 +02:00
philippe grand
0c7cfdb037 Update code using new css class 2017-04-24 16:36:58 +02:00
philippe grand
635894cf10 Update code using new css class 2017-04-20 14:51:36 +02:00
Juanjo Menent
4e2f4fd48b Merge pull request #6699 from grandoc/new_branch_12_04
Update code using new css class
2017-04-19 16:10:02 +02:00
Philippe Grand
88f771a7f1 Merge branch 'develop' into new_branch_12_04 2017-04-19 11:49:26 +02:00
Philippe Grand
a88d6425d7 Merge branch 'develop' into new_branch_13_04 2017-04-19 11:38:28 +02:00
Laurent Destailleur
3da0aea168 Prepare code to use different SMTP servers. 2017-04-18 01:39:06 +02:00
Laurent Destailleur
0994622bf8 NEW Can use translations into all substitutions (watermark, freetext...) 2017-04-17 23:54:09 +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
4818b1ba44 Load default values into $user->default_values 2017-04-14 12:39:11 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
philippe grand
1d546462dd Update code using new css class 2017-04-13 15:59:51 +02:00
philippe grand
edaa3ae672 Update code using new css class 2017-04-12 17:44:01 +02:00
Laurent Destailleur
423ffefbf3 NEW Add hidden option THIRDPARTY_INCLUDE_PARENT_IN_LINKTO 2017-04-11 18:18:36 +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
Laurent Destailleur
d15792bdf4 Minor fix 2017-04-11 00:59:47 +02:00
Laurent Destailleur
9b45776941 Fix responsive 2017-04-10 17:25:53 +02:00
Laurent Destailleur
06f9c1989b Work on default values 2017-04-10 13:14:31 +02:00
Laurent Destailleur
f1ae0eb7c6 Default value 2017-04-10 12:51:52 +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
bb7c164752 Work on page to set/edit default values 2017-04-08 14:18:10 +02:00
Laurent Destailleur
f598bf8bef Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2017-04-06 21:59:11 +02:00
Laurent Destailleur
a6c60e4a9a FIX shared bank account with multicompany not visible in invoice setup 2017-04-05 11:14:02 +02:00
Laurent Destailleur
6d81f29835 Merge pull request #6578 from inoveaconseil/patch-1
Update pdf.php
2017-03-31 18:07:03 +02:00
Laurent Destailleur
01a74a8d23 Work on 6.0 look and feel 2017-03-31 17:41:20 +02:00
Laurent Destailleur
979bcd3a9b NEW Can add a background image on login page 2017-03-31 11:40:31 +02:00
Laurent Destailleur
18e1e5b780 NEW Add "depends on" and "required by "into module informations 2017-03-30 15:54:48 +02:00
Laurent Destailleur
4df8dcf980 Work on module modBlockedLog and modModuleBuilder 2017-03-29 21:50:15 +02:00