Laurent Destailleur
|
ae103e34b8
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
build/debian/changelog
htdocs/compta/facture.php
htdocs/core/lib/price.lib.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/opensurvey/public/studs.php
htdocs/projet/element.php
|
2015-04-13 13:08:46 +02:00 |
|
Laurent Destailleur
|
1272b03e5e
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/fourn/facture/fiche.php
htdocs/product/stock/mouvement.php
htdocs/projet/element.php
htdocs/societe/rib.php
htdocs/theme/bureau2crea/img/statut4.png
|
2015-04-12 12:03:59 +02:00 |
|
Laurent Destailleur
|
6889162d7a
|
Fix: management of vat type 2, 4 and 6 is now ok.
Works for canada and ivory cost.
|
2015-04-11 22:51:53 +02:00 |
|
Laurent Destailleur
|
503a4ff7a0
|
Enhance filtering for bank transaction and timesheet.
|
2015-04-09 20:40:49 +02:00 |
|
Laurent Destailleur
|
3ee2790737
|
Always sho project info when opening task card
|
2015-04-09 16:26:21 +02:00 |
|
braito4
|
914b324a67
|
minor bug drag and drop total line in tasks list
|
2015-04-09 10:37:54 +02:00 |
|
Laurent Destailleur
|
1bbecc0912
|
Restore link to stock for products.
|
2015-04-08 19:26:36 +02:00 |
|
Frédéric FRANCE
|
0dc7bc0ddb
|
Add badge
|
2015-04-07 12:54:10 +02:00 |
|
Laurent Destailleur
|
6fa0234409
|
Uniformize code
|
2015-04-07 03:00:11 +02:00 |
|
Laurent Destailleur
|
ad50810c7a
|
Fix deprecated code
|
2015-04-07 02:48:19 +02:00 |
|
Laurent Destailleur
|
493392d89f
|
Remove warnings
|
2015-04-06 19:46:10 +02:00 |
|
Laurent Destailleur
|
c148f82452
|
Fix warning
|
2015-04-06 19:31:25 +02:00 |
|
Laurent Destailleur
|
3d161deb17
|
Fix more robust function
|
2015-04-06 16:50:26 +02:00 |
|
Laurent Destailleur
|
b49705d5d0
|
Status and amount of object should always be visible.
|
2015-04-06 16:13:23 +02:00 |
|
Scrutinizer Auto-Fixer
|
4da737424e
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2015-04-06 10:25:30 +00:00 |
|
Laurent Destailleur
|
2ec5595277
|
NEW Can install an external module from admin pages, if web server has
permission for and if setup is ok for.
|
2015-04-04 00:19:03 +02:00 |
|
Laurent Destailleur
|
106a393054
|
NEW Add function dolCopyDir to copy directory with recursive content.
|
2015-04-03 23:42:56 +02:00 |
|
Laurent Destailleur
|
afecab3f39
|
Better error management for dol_uncompress
|
2015-04-03 18:42:07 +02:00 |
|
Marcos García de La Fuente
|
7075ac74c4
|
Merge branch 'develop' into units
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobjectline.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/class/product.class.php
|
2015-04-03 15:45:54 +02:00 |
|
Laurent Destailleur
|
d8bec2fb59
|
Merge pull request #2507 from frederic34/doc4contact
Add document tab for contact
|
2015-04-02 11:41:35 +02:00 |
|
Laurent Destailleur
|
051f3474c4
|
Merge pull request #2512 from frederic34/patch-9
Add badge
|
2015-04-02 11:25:06 +02:00 |
|
Laurent Destailleur
|
8e9c1c4747
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/commande/list.php
htdocs/core/class/notify.class.php
htdocs/core/login/functions_dolibarr.php
htdocs/exports/export.php
htdocs/langs/en_US/admin.lang
|
2015-04-01 16:33:39 +02:00 |
|
Laurent Destailleur
|
c71efc8f2e
|
Avoid pb with scrutinizer
|
2015-03-31 16:59:40 +02:00 |
|
Frédéric FRANCE
|
2a34ec9db1
|
Add badge
|
2015-03-31 16:26:32 +02:00 |
|
frederic34
|
fe6227e93f
|
Typo
|
2015-03-31 08:45:36 +02:00 |
|
frederic34
|
bab04258e0
|
Add document tab for contact
|
2015-03-30 18:15:29 +02:00 |
|
Marcos García de La Fuente
|
8b8171c700
|
Merge branch 'develop' into commercial-name
Conflicts:
htdocs/comm/card.php
|
2015-03-30 03:25:57 +02:00 |
|
Frédéric FRANCE
|
bcd7516e25
|
Fix for donation.lib.php
|
2015-03-29 18:22:45 +02:00 |
|
Laurent Destailleur
|
73b2e0bd01
|
Merge pull request #2471 from marcosgdf/refactor
refactor
|
2015-03-29 16:17:36 +02:00 |
|
aspangaro
|
a92f68a5ed
|
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
|
2015-03-29 09:25:06 +02:00 |
|
aspangaro
|
ce6df7c022
|
Debug
|
2015-03-29 09:20:32 +02:00 |
|
frederic34
|
be1595a187
|
Add tab for notes
|
2015-03-28 17:42:33 +01:00 |
|
Laurent Destailleur
|
42c2c81e28
|
Fix detection of html was wrong with img
|
2015-03-26 12:05:52 +01:00 |
|
aspangaro
|
2b2b43afb6
|
Dir "Don"
|
2015-03-25 22:37:14 +01:00 |
|
aspangaro
|
679391d337
|
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
|
2015-03-25 20:59:48 +01:00 |
|
Laurent Destailleur
|
cc2d86bd58
|
Status of project was not visible on thirdparty card
|
2015-03-25 14:31:04 +01:00 |
|
aspangaro
|
9d34b40897
|
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
Conflicts:
htdocs/compta/bank/account.php
|
2015-03-24 05:28:57 +01:00 |
|
Laurent Destailleur
|
efe9c21b81
|
Merge pull request #2382 from aspangaro/develop-loan
NEW: Module loans
|
2015-03-23 23:28:57 +01:00 |
|
aspangaro
|
be0ab4c9b4
|
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
|
2015-03-23 06:58:25 +01:00 |
|
Marcos García de La Fuente
|
4349f27299
|
Revert "Revert "Refactor 1""
|
2015-03-23 01:39:12 +01:00 |
|
Laurent Destailleur
|
5c36bb94f2
|
Work on theme material design
|
2015-03-22 22:29:52 +01:00 |
|
Laurent Destailleur
|
1a1959b52c
|
Fix: Solve conflict with imgup and imgdown class use for sort fields and
to drag and drop lines.
|
2015-03-22 21:18:25 +01:00 |
|
aspangaro
|
ad0f1aae6b
|
Move loan in htdocs
|
2015-03-22 20:19:22 +01:00 |
|
Laurent Destailleur
|
49824a0e56
|
Method colorStringToArray can accept the #
Method monthArray can return short label of month
|
2015-03-22 18:17:25 +01:00 |
|
aspangaro
|
414d4c6432
|
Merge remote-tracking branch 'Upstream/develop' into develop-loan
|
2015-03-22 18:08:12 +01:00 |
|
Laurent Destailleur
|
2d90256640
|
Revert "Refactor 1"
|
2015-03-22 12:51:29 +01:00 |
|
Laurent Destailleur
|
a79a779b04
|
Merge pull request #2456 from marcosgdf/refactor-1
Refactor 1
|
2015-03-22 12:47:05 +01:00 |
|
Laurent Destailleur
|
a55af4387b
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
.travis.yml
htdocs/core/class/notify.class.php
htdocs/product/stock/class/mouvementstock.class.php
test/phpunit/AllTests.php
test/phpunit/MouvementStockTest.php
|
2015-03-22 12:10:39 +01:00 |
|
aspangaro
|
9264482e25
|
Update works
|
2015-03-22 08:20:19 +01:00 |
|
Laurent Destailleur
|
73266bb965
|
Fix error when using a log hangler that make output into the http
header. We must add a log before any generation of ouput content so we
are sure a buffering of output has been started.
|
2015-03-21 01:22:05 +01:00 |
|