Alexis Algoud
ba70794c1d
Add multicompany->enabled test
2013-12-16 09:45:38 +01:00
Laurent Destailleur
6946fdbcda
Merge remote-tracking branch 'origin/3.5' into develop
2013-12-16 00:09:29 +01:00
Laurent Destailleur
7864fe3cfd
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/tpl/objectline_edit.tpl.php
2013-12-16 00:07:50 +01:00
Laurent Destailleur
6e9b8dc77a
Fix: Missing special code
2013-12-15 21:10:39 +01:00
Laurent Destailleur
3c87e1e20d
Fix: no required class for not mandatory fields
2013-12-15 18:11:56 +01:00
Laurent Destailleur
ef2f8ea67d
Removed some FIXME
2013-12-15 14:26:27 +01:00
Laurent Destailleur
c34e50114a
Start to work on a basic print sticker tool
2013-12-15 03:23:10 +01:00
Laurent Destailleur
fbeb61861a
Start to remove too low level permission. Philisophy of dolibarr is
...
having a minum of permission. Starting to include one permission for
each field we manage should not be into core.
Also activation of "skype" field in a future should probably be
rewritten to support as several communication id (chat, skype,
hanghout) with only one feature.
2013-12-14 20:58:03 +01:00
Laurent Destailleur
dc754bbdc2
Fix: Trigger name conflicts and reference file was not matching real
...
name of triggers.
2013-12-14 20:48:34 +01:00
Laurent Destailleur
db10740e2a
Merge pull request #1344 from GPCsolutions/feature/multicompanybookmarks
...
Feature/multicompanybookmarks
2013-12-13 18:52:38 -08:00
Laurent Destailleur
eaf151d7f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/.gitignore
htdocs/contact/fiche.php
2013-12-14 03:13:46 +01:00
Laurent Destailleur
42f032ded3
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-14 01:30:15 +01:00
Laurent Destailleur
8d872ab4fb
Uniformize code and more comments
2013-12-14 00:24:43 +01:00
Laurent Destailleur
2f5932026e
More information returned into return code
2013-12-13 18:33:05 +01:00
Laurent Destailleur
9a07f31a8c
Doxygen
...
Bad translation
2013-12-13 17:36:43 +01:00
Alexis Algoud
4844aed67e
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5
2013-12-11 15:15:30 +01:00
Regis Houssin
0247241277
Fix: wrong path with multicompany module
2013-12-11 12:23:36 +01:00
Laurent Destailleur
286bdf91d4
Better detection of corrupted module files.
2013-12-10 18:52:48 +01:00
Laurent Destailleur
c3c6588426
Better detection of corrupted module files.
2013-12-10 16:25:27 +01:00
Laurent Destailleur
65593bce34
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-12-10 15:51:16 +01:00
Laurent Destailleur
8fb0986303
New: Add path file of trigger into admin trigger list page
2013-12-10 15:49:57 +01:00
Raphaël Doursenaud
071dd8e758
Make bookmarks module multicompany aware
2013-12-10 12:00:42 +01:00
Laurent Destailleur
f804833b9c
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/modules/modFacture.class.php
2013-12-08 22:38:10 +01:00
Laurent Destailleur
825640d645
Fix: Missing special code into export
2013-12-08 21:24:59 +01:00
Laurent Destailleur
3c0c9019b5
Comment
2013-12-08 15:40:22 +01:00
Laurent Destailleur
37b0780523
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/ecm/tpl/builddatabase.tpl.php
htdocs/fourn/commande/liste.php
htdocs/product/admin/product_tools.php
2013-12-08 00:42:36 +01:00
Laurent Destailleur
0e819ab5cd
Fix: Missing test
2013-12-07 16:43:35 +01:00
Laurent Destailleur
598a241366
Fix: minor css.
...
Fix: Alignement of screenshot was wrong. Wrapping too.
2013-12-06 10:23:26 +01:00
Laurent Destailleur
4d9712ea4c
Merge pull request #1318 from csalvador/develop-fichinterPDF
...
Develop fichinter pdf
2013-12-04 09:41:13 -08:00
Laurent Destailleur
24ce511671
Fix: [ bug #1167 ] Supplier IBAN account number set but no account
...
specified warning
2013-12-04 18:20:58 +01:00
Florian Henry
c2a8967b52
Much better fix for translated product description into PDF
2013-12-03 17:06:19 +01:00
Laurent Destailleur
6c7e173bba
Fix: jmobile broken with css tagtable, tagtr and tagtd
2013-12-02 22:31:02 +01:00
Alexis Algoud
bb191021de
Add entitytotest test, because a LDAP user can override the entity restriction without this test
2013-12-02 16:04:30 +01:00
Alexis Algoud
38c7c609bc
Error on mercure bill's number function.
...
Ex draft bill for november :
mask = FC{yy}{mm}{000@99}
{mm} = 11
On validation, number -> FC131160 instead of FC131112
2013-12-02 11:42:39 +01:00
Florian Henry
3e712c9c8c
Finnaly make it works
2013-12-02 11:11:08 +01:00
Florian Henry
0907d81fcb
Avoid strpos bug if string is empty or null
2013-12-02 11:05:07 +01:00
Florian Henry
1ad1b25f6e
remove useless space
2013-12-02 10:29:58 +01:00
Florian Henry
1b38d36f28
Better Fix
2013-12-02 10:27:41 +01:00
Florian Henry
c0ef63fd74
Bteer fix
2013-12-02 00:22:49 +01:00
Florian Henry
ff9c84fd0e
Better test for HTMLentities desc translation
2013-12-02 00:20:50 +01:00
Florian Henry
c6991f97d4
[ bug #1174 ] Product translated description not good into PDF
...
Country
2013-12-01 22:47:22 +01:00
Laurent Destailleur
0b9e8d6832
Fix: Alignement
2013-12-01 19:41:41 +01:00
Laurent Destailleur
e9e94b9e47
Fix: Alignement
2013-12-01 19:39:21 +01:00
Laurent Destailleur
b6386a3dce
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/core/tpl/objectline_add.tpl.php
2013-12-01 16:08:03 +01:00
Laurent Destailleur
519919889c
Fix comment
2013-11-30 16:57:11 +01:00
Cédric Salvador
22d31817de
made getVATRates synchronous to avoid concurrency problems
2013-11-29 12:13:23 +01:00
Laurent Destailleur
e27d109f2d
Merge pull request #1328 from csalvador/develop-fixAJAX
...
Develop fix ajax
2013-11-29 02:59:11 -08:00
Grand Philippe
c0650d6da3
Merge branch '3.5' of https://github.com/Dolibarr/dolibarr into 3.5
2013-11-29 08:30:46 +01:00
Laurent Destailleur
ea51e9ec77
Merge remote-tracking branch 'origin/3.5' into develop
2013-11-28 18:57:43 +01:00
Laurent Destailleur
d0b05bb5af
Fix: Restore style code lost by a commit.
2013-11-28 18:55:36 +01:00
