Commit Graph

41724 Commits

Author SHA1 Message Date
Jean-François Ferry
a76fef5f35 Work on resource list / navbar into card 2014-05-10 22:07:13 +02:00
Jean-François Ferry
c2081b299f Missing resource type select list into add form 2014-05-10 22:07:13 +02:00
Jean-François Ferry
e4962e9efd Add resource card 2014-05-10 22:07:13 +02:00
Jean-François Ferry
6a9bf009f2 Clean code 2014-05-10 22:07:13 +02:00
Jean-François Ferry
7fbcb4fe7d Missing auto-increlent attribute when table c_resource_type create 2014-05-10 22:07:12 +02:00
Jean-François Ferry
5f74b86b18 Add dictionary to define type of resources 2014-05-10 22:07:12 +02:00
Jean-François Ferry
3e522b1f54 Add picto 2014-05-10 22:07:12 +02:00
Jean-François Ferry
87419bf357 Add lang chains 2014-05-10 22:07:12 +02:00
Jean-François Ferry
eb2c274525 Add method to load type code from dictionary 2014-05-10 22:07:12 +02:00
Jean-François Ferry
04aa373282 Add fetch and update method for resource 2014-05-10 22:07:12 +02:00
Jean-François Ferry
c42697dd78 New : can add new resource in database 2014-05-10 22:07:12 +02:00
Jean-François Ferry
703572cd5b Add en_US langfile for resource module 2014-05-10 22:07:12 +02:00
Jean-François Ferry
1d929d267c Move table creation instruction into migration tables 2014-05-10 22:07:12 +02:00
Jean-François Ferry
03f0851e7d Add database tables for resource module 2014-05-10 22:06:23 +02:00
Jean-François Ferry
c5e02edfa8 Add submenu for adding resource 2014-05-10 22:06:23 +02:00
Jean-François Ferry
1caffcffaf Add new perm to link resource to an element 2014-05-10 22:06:23 +02:00
Jean-François Ferry
3a866bd611 Fix: bad perm for resource module 2014-05-10 22:06:22 +02:00
Jean-François Ferry
c04812cd15 Fix: bad lang file 2014-05-10 22:06:22 +02:00
Jean-François Ferry
1ad3405ee8 Qual : codesniffer 2014-05-10 22:06:22 +02:00
Jean-François Ferry
a2bfcfae31 Qual : codesniffer 2014-05-10 22:06:22 +02:00
Jean-François Ferry
6c75a0cb11 Add database tables for resource module 2014-05-10 22:06:22 +02:00
Jean-François Ferry
9e542397ef Missing lang key 2014-05-10 22:06:22 +02:00
Jean-François Ferry
fdb50ab116 Move generic function from commonobject.class to functions2.lib.php (work on resource module) 2014-05-10 22:06:22 +02:00
Jean-François Ferry
e76ce87547 Remove unused css 2014-05-10 22:03:05 +02:00
Jean-François Ferry
6e24004e82 Remove resource module config page 2014-05-10 22:03:05 +02:00
Jean-François Ferry
bb58bed930 In commonoobject add method for adding resource to an element 2014-05-10 22:03:05 +02:00
Jean-François Ferry
e63f8b87c1 Mark resource module as experimental / need Dolibarr 3.5 2014-05-10 22:03:05 +02:00
Jean-François Ferry
71c44d82ab Move resource module functions into commonobject :
- new method to get an array with object properties
- new method to fetch an object only with id and element_type
2014-05-10 22:03:05 +02:00
Jean-François Ferry
d9c567ca3d Prepare structure for upstream merge 2014-05-10 22:03:05 +02:00
Jean-François Ferry
98491ff277 Fix conflict 2014-05-10 22:03:05 +02:00
jfefe
06f17da1e5 Fix for custom directory 2014-05-10 22:03:04 +02:00
Florian Henry
b090a4d223 fix pb 2014-05-10 22:03:04 +02:00
jfefe
9de6368be9 First version of resource module 2014-05-10 22:03:04 +02:00
Laurent Destailleur
3776f7b146 Fix: margin calculation from % when we enter a free product. 2014-05-10 20:10:59 +02:00
Laurent Destailleur
2bac66fd52 Merge remote-tracking branch 'origin/3.5' into develop 2014-05-10 19:53:06 +02:00
Laurent Destailleur
7bb24969d8 Fix: [ bug #1372 ] Margin calculation does not work in proposals 2014-05-10 19:52:24 +02:00
Laurent Destailleur
12055aa44a I did a better fix to have no more dependencies between modules. 2014-05-10 19:04:33 +02:00
Laurent Destailleur
c20a5d7e18 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-10 19:02:55 +02:00
Laurent Destailleur
f95c87f1d6 Fix: [ bug #1374 ] Salaries module requires "Special costs" module to
work but it does not enable it
2014-05-10 18:57:04 +02:00
Juanjo Menent
4e53b57313 Fix: [ bug #1374 ] Salaries module requires "Special costs" module to
work but it does not enable it
2014-05-10 17:54:13 +02:00
Juanjo Menent
373b16f7be Trad: Update es_ES from transifex 2014-05-10 17:33:23 +02:00
Laurent Destailleur
f36b9effe8 Fix: [ bug #1373 ] Required type of payment input is not visible 2014-05-10 17:22:12 +02:00
Laurent Destailleur
3fd7e18c08 Fix: Bad translation into title of action buttons 2014-05-10 17:00:55 +02:00
Laurent Destailleur
1724fd2f89 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-10 16:44:12 +02:00
Laurent Destailleur
4e41b721fb Fix: Nb of notes and doc not visible onto tasks. 2014-05-10 16:43:47 +02:00
Laurent Destailleur
a5ccc538c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-10 15:52:30 +02:00
Laurent Destailleur
33fe18490a Removed useless translation key 2014-05-10 15:50:32 +02:00
Laurent Destailleur
37850b8f6f Merge pull request #1586 from fappels/develop
fix: if note not set, insert null iso "null"
2014-05-10 15:45:34 +02:00
Laurent Destailleur
f855709cf4 Merge pull request #1585 from FHenry/3.5
"or" into if instead of ||
2014-05-10 15:44:25 +02:00
Laurent Destailleur
eb32094864 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-10 15:33:45 +02:00