Laurent Destailleur
194260fc5b
NEW: Add search box for supplier order search.
2015-03-10 13:25:25 +01:00
Laurent Destailleur
88a29b7c9c
Add an advance permission to check/uncheck reception
2015-03-09 20:26:56 +01:00
Laurent Destailleur
3e48456359
Fix when no price defined, we must how nothing instead of 0
2015-03-08 02:13:47 +01:00
Laurent Destailleur
56b5bfd25b
NEW: Implement option SUPPLIER_ORDER_USE_DISPATCH_STATUS to add a status
...
into each dispathing line of supplier order to "verify" a
reception is ok. Status of order can be set to "total/done" only if line
is verified.
2015-03-08 02:08:26 +01:00
Laurent Destailleur
dd13e477b1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-03-07 19:07:21 +01:00
Laurent Destailleur
9e4e9a5411
NEW: Can search on customer order amount into customer order list.
2015-03-06 20:59:18 +01:00
Laurent Destailleur
a1567778ab
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/commande/card.php
2015-03-06 18:51:55 +01:00
Laurent Destailleur
e55a983c03
Fix td balance
2015-03-06 16:13:09 +01:00
Laurent Destailleur
a169b3348e
Fix show alays date fields for contract module.
...
Fix select of product were lost.
2015-03-06 14:36:22 +01:00
Laurent Destailleur
d119397129
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/societe/class/societe.class.php
2015-03-05 11:38:16 +01:00
Laurent Destailleur
6c1c1fd691
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/lib/agenda.lib.php
htdocs/fourn/paiement/fiche.php
2015-03-05 11:35:39 +01:00
Laurent Destailleur
7b7b5090c7
Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into
...
atm-ph-incoterm
Conflicts:
htdocs/comm/propal.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-04 23:03:29 +01:00
Laurent Destailleur
96de912661
NEW: Add module "Supplier commercial proposals" to requests
...
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/tpl/document_actions_post_headers.tpl.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-04 17:54:43 +01:00
Marcos García de La Fuente
f94f9d1e57
Removed $permtoedit variable
2015-03-04 11:19:45 +01:00
Marcos García de La Fuente
6ec8a38e4a
Removed duplicated code
2015-03-04 10:46:39 +01:00
Marcos García de La Fuente
a7741350fe
Revert unwanted change
2015-03-04 10:41:40 +01:00
Marcos García de La Fuente
54b6b199c7
Documented missing properties and removed redundant documentation
...
(cherry picked from commit 6124f6a
2015-03-04 10:37:48 +01:00
Marcos García de La Fuente
e1982c54d9
Moved duplicated code to common class
2015-03-04 10:37:47 +01:00
Marcos García de La Fuente
f82df1e634
Refactorred supplier order to match with objectline templates
2015-03-04 10:37:47 +01:00
Marcos García de La Fuente
47a151f157
Created supplier invoice line
2015-03-04 10:37:46 +01:00
Marcos García de La Fuente
b84cf4afac
Renamed FactureFournisseurLine to SupplierInvoiceLine
2015-03-04 10:37:46 +01:00
Marcos García de La Fuente
c7919a8d08
Removed duplicated code
2015-03-04 10:37:45 +01:00
Marcos García de La Fuente
77605bce3e
[ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment
2015-03-02 13:33:31 +01:00
Laurent Destailleur
8a00109baf
Fix: Several bugs int replenishment feature.
2015-03-01 16:05:20 +01:00
Laurent Destailleur
560f1a43cd
Fix: Several bugs int replenishment feature.
2015-03-01 16:04:34 +01:00
Laurent Destailleur
1cdd77a671
Fix: use bad var
2015-02-28 18:18:41 +01:00
Laurent Destailleur
4d226885cb
Rewrite code for supplier order and invoice to use shared code of
...
customer supplier and invoice.
Work on extrafield for supplier order and invoice.
2015-02-28 18:10:31 +01:00
Marcos García de La Fuente
2ba795fcbc
NEW: [ task #851 ] Add a new field: Commercial name
2015-02-28 14:30:06 +01:00
Laurent Destailleur
8e26c71fa7
Rewrite code for supplier order and invoice to use shared code of
...
customer supplier and invoice.
Work on extrafield for supplier order and invoice.
2015-02-28 04:59:27 +01:00
Laurent Destailleur
ef14e4e7ed
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.product.class.php
2015-02-28 03:11:15 +01:00
Laurent Destailleur
5d1545ad1f
Work on supplier order and customer extrafields
...
Use templates to show/edit supplier order and invoice lines
2015-02-27 18:05:12 +01:00
Laurent Destailleur
8f378b4480
Fix no error returned when contact already exists
2015-02-26 15:52:14 +01:00
Laurent Destailleur
d6438a51ab
Add log to help track bug
2015-02-26 15:24:15 +01:00
Laurent Destailleur
4bde7e9f51
Fix: Missing error management
2015-02-26 14:25:30 +01:00
Laurent Destailleur
daabc113a5
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
README.md
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
2015-02-26 13:36:07 +01:00
Laurent Destailleur
41a74c62e2
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:03:17 +01:00
Laurent Destailleur
9842e816d0
Fix bad sql type
...
Fix no input outside tr-td
2015-02-24 11:24:15 +01:00
Laurent Destailleur
eb4eededbd
Add class to manage table commande_fournisseur_dispatch
2015-02-24 11:19:47 +01:00
Laurent Destailleur
bbc82e829b
Fix bad sql request
2015-02-23 23:28:55 +01:00
Laurent Destailleur
afa8e5c6d8
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-23 19:50:51 +01:00
Laurent Destailleur
4128c86035
Fix: Filter on statut was lost
2015-02-23 19:31:42 +01:00
Laurent Destailleur
6d3834b3b9
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/index.php
htdocs/projet/class/project.class.php
test/phpunit/BankAccountTest.php
2015-02-23 14:59:24 +01:00
phf
127868899d
Merge branch 'develop' into incoterm
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-02-23 10:42:01 +01:00
phf
81130634d3
[CORE] intégration de incoterm sur les différentes class (#incoterm).
2015-02-23 09:16:14 +01:00
Laurent Destailleur
b04682db4c
Fix Edit of extrafield on supplier invoice or order was deleteing other
...
fields.
Fix Missing escapment
Fix new field delivery date was only into edit page
2015-02-22 17:41:02 +01:00
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Laurent Destailleur
774389940e
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/propal/list.php
htdocs/compta/bank/ligne.php
htdocs/compta/resultat/clientfourn.php
htdocs/compta/salaries/fiche.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/facture/paiement.php
2015-02-18 23:51:41 +01:00
Laurent Destailleur
316e5c2f19
Merge pull request #2358 from marcosgdf/board-refactor
...
Refactored dashboard indicator
2015-02-18 23:39:15 +01:00
Laurent Destailleur
d7dcf28c61
Merge branch '3.7' of https://github.com/atm-gauthier/dolibarr into
...
atm-gauthier-3.7
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2015-02-18 23:15:40 +01:00
Laurent Destailleur
fc415fc3c9
Fix: [ bug #1826 ] Supplier payment types are not translated in
...
fourn/facture/paiement.php
2015-02-18 22:44:42 +01:00
