Laurent Destailleur
|
c9f690904c
|
Merge pull request #2514 from frederic34/patch-10
Correction for workboard in compta/bank/index.php
|
2015-04-02 11:40:55 +02:00 |
|
aspangaro
|
309b059089
|
New: Add a button to purge criteria in bank lines list
|
2015-03-31 21:00:22 +02:00 |
|
Frédéric FRANCE
|
fc5d7e57a2
|
Correction for workboard in compta/bank/index.php
|
2015-03-31 18:31:36 +02:00 |
|
Laurent Destailleur
|
2bdca3d76b
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-03-31 11:33:10 +02:00 |
|
Laurent Destailleur
|
2d50cc92b9
|
Differentiate title for customer and supplier orders/invoices.
|
2015-03-31 11:32:47 +02:00 |
|
Laurent Destailleur
|
86603b01dd
|
Merge pull request #2504 from marcosgdf/constants
Implemented constants for some object types and statuses
|
2015-03-30 09:25:18 +02:00 |
|
Laurent Destailleur
|
b83e9ea32f
|
Merge branch 'loan' of https://github.com/frederic34/dolibarr into
frederic34-loan
Conflicts:
htdocs/compta/bank/ligne.php
|
2015-03-30 02:56:26 +02:00 |
|
Marcos García de La Fuente
|
cc1d298f29
|
Merge branch 'develop' into constants
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture/class/facture.class.php
|
2015-03-30 02:36:46 +02:00 |
|
aspangaro
|
c22a563422
|
New: Add management for accounting account in admin donation & correct bugs
|
2015-03-29 21:04:20 +02:00 |
|
frederic34
|
b6b1617741
|
Work on payment loan
|
2015-03-29 17:53:36 +02:00 |
|
Laurent Destailleur
|
73b2e0bd01
|
Merge pull request #2471 from marcosgdf/refactor
refactor
|
2015-03-29 16:17:36 +02:00 |
|
Laurent Destailleur
|
661961876a
|
Merge pull request #2485 from aspangaro/develop-patch2
Fix: Missing language key
|
2015-03-29 15:05:37 +02:00 |
|
aspangaro
|
ce6df7c022
|
Debug
|
2015-03-29 09:20:32 +02:00 |
|
aspangaro
|
9d25a1c7ed
|
Fix: Missing language key
|
2015-03-27 06:59:21 +01:00 |
|
aspangaro
|
77b123cb2d
|
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
|
2015-03-27 06:30:35 +01:00 |
|
aspangaro
|
a39f81b1a6
|
FIXED: Correct path of loan class
|
2015-03-26 20:51:27 +01:00 |
|
aspangaro
|
b60f1e33d6
|
Debug
|
2015-03-26 06:29:16 +01:00 |
|
aspangaro
|
2b2b43afb6
|
Dir "Don"
|
2015-03-25 22:37:14 +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 |
|
Marcos García de La Fuente
|
3d50b41b8e
|
Reverted $rowid instead of $id property
|
2015-03-23 01:40:33 +01:00 |
|
Marcos García de La Fuente
|
4349f27299
|
Revert "Revert "Refactor 1""
|
2015-03-23 01:39:12 +01:00 |
|
aspangaro
|
ad0f1aae6b
|
Move loan in htdocs
|
2015-03-22 20:19:22 +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 |
|
aspangaro
|
b4b3c45dbc
|
Update works
|
2015-03-21 18:00:16 +01:00 |
|
aspangaro
|
c4a580723d
|
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
|
2015-03-20 06:36:06 +01:00 |
|
aspangaro
|
fa41132372
|
Move module Don in htdocs->donations
|
2015-03-19 05:22:42 +01:00 |
|
aspangaro
|
4e68586389
|
Move module Dons in htdocs>donations
|
2015-03-19 05:08:23 +01:00 |
|
aspangaro
|
dbeccf7653
|
Update work
|
2015-03-18 21:56:00 +01:00 |
|
Laurent Destailleur
|
6ceda02eaa
|
NEW: Enhancement of module 'Notification by Email'. Show nb of
notifications set. Can set several emails. Can set a threshold on
amount for notifications. Add notification on supplier order validation.
|
2015-03-18 21:44:57 +01:00 |
|
Laurent Destailleur
|
cd2fc2f890
|
Hooks 'printLeftBlock' and 'formConfirm' are now compliant with hook
development rules. They are "addreplace" hooks, so you must return
content with"->resprints='mycontent'" and not with "return 'mycontent'"
|
2015-03-18 14:31:37 +01:00 |
|
aspangaro
|
e6d9d18f25
|
Update work on donation
|
2015-03-18 06:29:10 +01:00 |
|
aspangaro
|
4e83952485
|
Add payment on donation
|
2015-03-18 05:07:32 +01:00 |
|
Laurent Destailleur
|
6e251690ab
|
Doxygen
|
2015-03-17 11:23:45 +01:00 |
|
aspangaro
|
03bf12bdc0
|
Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc
|
2015-03-16 06:32:11 +01:00 |
|
aspangaro
|
1cd81f0e81
|
Work on module donations
|
2015-03-16 06:29:15 +01:00 |
|
Marcos García de La Fuente
|
086e439543
|
Merge branch 'develop' into refactor-1
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
|
2015-03-15 18:16:55 +01:00 |
|
Marcos García de La Fuente
|
efb9f7f4fd
|
Merge branch 'develop' into refactor-1
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/includes/tcpdi/fpdf_tpl.php
|
2015-03-15 18:07:30 +01:00 |
|
aspangaro
|
d69f066735
|
QUAL: Traduce terms + remove <center>
|
2015-03-15 14:04:07 +01:00 |
|
Marcos García de La Fuente
|
094538c07b
|
Implemented constants in Commande, Facture and Propal
|
2015-03-15 11:48:57 +01:00 |
|
Laurent Destailleur
|
c45ec24958
|
Merge pull request #2379 from atm-maxime/develop
New : replenish function adds new lines into already existing draft supplier order instead of creating a new supplier order
|
2015-03-14 14:08:38 +01:00 |
|
Juanjo Menent
|
a2adeb2807
|
Fix: [ bug #1836 ] Required parameter missing in Rejetprelevement line
159
|
2015-03-14 10:17:41 +01:00 |
|
Maxime Kohlhaas
|
3578ca8baa
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
|
2015-03-11 08:52:09 +01:00 |
|
aspangaro
|
3897e65425
|
Merge remote-tracking branch 'Upstream/develop' into develop-loan
|
2015-03-11 05:28:59 +01:00 |
|
Laurent Destailleur
|
a5645b626c
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
htdocs/projet/element.php
|
2015-03-11 03:55:46 +01:00 |
|
Laurent Destailleur
|
c1432eb2da
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/compta/salaries/fiche.php
htdocs/projet/element.php
|
2015-03-11 03:29:52 +01:00 |
|
Laurent Destailleur
|
e8732df747
|
Merge pull request #2441 from aspangaro/develop-ReviewER
FIXED: Review Expense Report
|
2015-03-11 02:14:13 +01:00 |
|
Maxime Kohlhaas
|
05a2a6af00
|
FIX : [bug #1900] Unable to remove a salary with enough permissions
|
2015-03-10 15:53:02 +01:00 |
|
Maxime Kohlhaas
|
6f9fb6a282
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
|
2015-03-10 15:18:08 +01:00 |
|