atm-greg
|
58535993c1
|
use special_code on order_supplier lines
|
2018-04-13 10:31:27 +02:00 |
|
Laurent Destailleur
|
3078b890d4
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/stripe/admin/stripe.php
|
2018-04-13 00:45:39 +02:00 |
|
Laurent Destailleur
|
f7bb781b42
|
FIX #8571
|
2018-04-13 00:43:15 +02:00 |
|
Laurent Destailleur
|
7108f68db9
|
Remove old deprecated hook insertExtraFields. Triggers must be used for
action on CRUD events.
|
2018-04-10 12:03:01 +02:00 |
|
Laurent Destailleur
|
9e89675862
|
Fix creation of supplier invoice
|
2018-04-06 20:34:12 +02:00 |
|
François J
|
a78c064461
|
Fix CommandeFournisseur::getDispachedLines line ID & return quantity
|
2018-04-06 11:22:15 +02:00 |
|
François J
|
041a21e829
|
Add tag @since
|
2018-04-04 14:05:50 +02:00 |
|
François J
|
9b61272bb7
|
Fix CommandeFournisseur::getDispachedLines line ID & return quantity
|
2018-04-04 12:32:49 +02:00 |
|
Laurent Destailleur
|
64f21b8a3c
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expensereport/card.php
|
2018-03-11 00:10:13 +01:00 |
|
Maxime Kohlhaas
|
d82c62b638
|
Fix supplier order clone was keeping objectlinked
|
2018-03-09 21:51:59 +01:00 |
|
atm-ph
|
53ce297ab3
|
Fix travis - missing documentation of new param
|
2018-03-09 09:30:11 +01:00 |
|
Laurent Destailleur
|
1c9e7145e7
|
Merge pull request #8276 from ATM-Consulting/develop_atm
NEW: supplier credit notes & discounts (absolute and relative)
|
2018-03-08 20:06:37 +01:00 |
|
Regis Houssin
|
93a9430e49
|
Fix: regression, restore primary key
|
2018-03-08 07:41:54 +01:00 |
|
Laurent Destailleur
|
cf45f78d7e
|
Merge pull request #8218 from OPEN-DSI/product_supplier_buyprice_multicurrency
NEW Add multicurrency support for product buy price for supplier propales, orders and invoices
|
2018-03-07 13:12:23 +01:00 |
|
atm-ph
|
5971cd8e59
|
Fix label goes in desc and lost fourn ref
|
2018-03-05 17:18:03 +01:00 |
|
atm-ph
|
ebb4da8417
|
Fix keep supplier proposal price in supplier order
|
2018-03-05 16:58:35 +01:00 |
|
Marc de Lima Lucio
|
7cd1b2caa9
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
|
2018-02-27 16:45:01 +01:00 |
|
Marc de Lima Lucio
|
239e834913
|
FIX: supplier credit notes: remove handled TODO
|
2018-02-27 10:04:02 +01:00 |
|
Laurent Destailleur
|
de89893d57
|
NEW Show total of time consumed in week in time spent entry page
|
2018-02-26 14:09:56 +01:00 |
|
kkhelifa-opendsi
|
90f4c985f6
|
Merge branch 'develop' into product_supplier_buyprice_multicurrency
|
2018-02-26 09:54:09 +01:00 |
|
Laurent Destailleur
|
003827eb06
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-02-25 15:01:19 +01:00 |
|
Laurent Destailleur
|
b52a2b12a5
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-02-25 14:44:49 +01:00 |
|
Laurent Destailleur
|
2cd5ed65a6
|
Clean deprecated (field unit_charge in supplier price)
|
2018-02-25 14:13:09 +01:00 |
|
Regis Houssin
|
703d976b3b
|
Fix: missing object entity in fetch
|
2018-02-24 16:21:16 +01:00 |
|
KHELIFA
|
54dba24ab5
|
Add multicurrency support for product buy price for supplier propales, orders and invoices
|
2018-02-23 11:06:07 +01:00 |
|
dolibarr95
|
6793d826b7
|
Dispatch if more than ordered
If the constant SUPPLIER_ORDER_MORE_THAN_WISHED is set
|
2018-02-23 10:14:54 +01:00 |
|
Laurent Destailleur
|
c4130730cb
|
Clean code around fetch_optionals()
|
2018-02-20 19:38:18 +01:00 |
|
Laurent Destailleur
|
809ef1bd00
|
FIX Trigger *_MODIFY must be called when editing a property event extra.
Clean duplicate trigggers "*_CLONE"
|
2018-02-20 18:09:38 +01:00 |
|
Marc de Lima Lucio
|
57b8df4008
|
FIX: supplier credit notes: delete discount when deleting linked invoice/invoice line
|
2018-02-19 17:32:11 +01:00 |
|
Marc de Lima Lucio
|
f5ad93b272
|
NEW: supplier credit notes: handle Excess Paid + translation
|
2018-02-19 15:52:07 +01:00 |
|
Marc de Lima Lucio
|
e2b65b3755
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note
|
2018-02-16 09:14:53 +01:00 |
|
Marc de Lima Lucio
|
daca27b2ed
|
NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring
|
2018-02-14 18:02:40 +01:00 |
|
Laurent Destailleur
|
536eb7e008
|
Fix label of invoice
|
2018-02-14 17:25:13 +01:00 |
|
Marc de Lima Lucio
|
4f9bb33600
|
NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid
|
2018-02-14 10:47:10 +01:00 |
|
Laurent Destailleur
|
d3a6342034
|
Fix regeneration of PDF after creation of payment.
|
2018-02-02 10:37:10 +01:00 |
|
Laurent Destailleur
|
e79f6fda2b
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-01-26 01:23:18 +01:00 |
|
Laurent Destailleur
|
2c0eeaf8de
|
FIX #8093
|
2018-01-25 20:57:51 +01:00 |
|
Laurent Destailleur
|
e56d74f5c4
|
Fix generation of doc for supplier payment
|
2018-01-11 19:01:47 +01:00 |
|
Laurent Destailleur
|
0b893c11fd
|
Revert "Fix wrong address used into PDF model of supplier payment"
This reverts commit 22d92c0540.
|
2018-01-11 18:09:05 +01:00 |
|
Laurent Destailleur
|
af6b84ba3a
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/list.php
htdocs/contact/document.php
htdocs/product/list.php
|
2018-01-11 01:03:13 +01:00 |
|
atm-ph
|
22d92c0540
|
Fix wrong address used into PDF model of supplier payment
|
2018-01-08 15:25:18 +01:00 |
|
Laurent Destailleur
|
d7837f8800
|
Try fix for #7778
|
2018-01-05 01:43:51 +01:00 |
|
Laurent Destailleur
|
1351a43a30
|
FIX Maxi debug of permission for users external or restricted to sales
representatives
|
2017-12-18 16:13:05 +01:00 |
|
Laurent Destailleur
|
247c380d18
|
Several fixes
|
2017-12-12 16:11:40 +01:00 |
|
Laurent Destailleur
|
93311e3817
|
FIX #7885
|
2017-12-05 12:31:57 +01:00 |
|
fappels
|
cec490dff5
|
Fix dispatch not adapted for label to ref change for warehouse
|
2017-12-01 12:57:56 +01:00 |
|
Laurent Destailleur
|
b63fb1f854
|
Support of VAT NPR in accounting module
|
2017-11-27 22:18:10 +01:00 |
|
Laurent Destailleur
|
a9d3e90b70
|
Big debug of accountancy module
|
2017-11-27 21:53:22 +01:00 |
|
Laurent Destailleur
|
aaf08ade2f
|
Fix bug reported by scrutinizer
|
2017-11-25 11:21:31 +01:00 |
|
Laurent Destailleur
|
6a3dc91414
|
Standardize code
|
2017-11-23 15:22:32 +01:00 |
|
Laurent Destailleur
|
b93e35cdd2
|
Fix a lot of request to use the IN getentity instead of =
Fix a lot of request to use left join on type of payment table
|
2017-11-23 15:06:16 +01:00 |
|
Laurent Destailleur
|
a12186a0b8
|
Use HTTP response code 304 instead of 500 when nothing is done
|
2017-11-14 01:26:02 +01:00 |
|
Laurent Destailleur
|
bf121f9b3c
|
Work on saving supplier_ref into database lines
|
2017-11-12 19:29:03 +01:00 |
|
Ion
|
e95ee4b878
|
Fix old parseProductSupplier call
|
2017-11-10 12:32:54 +01:00 |
|
Laurent Destailleur
|
a329f7dc75
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
build/exe/doliwamp/doliwamp.iss
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/list.php
|
2017-11-05 18:50:14 +01:00 |
|
Laurent Destailleur
|
d3a0cff30a
|
Merge pull request #7755 from frederic34/currency
default currency on propal create
|
2017-11-05 18:28:40 +01:00 |
|
Laurent Destailleur
|
51c705a84b
|
NEW Reduce size of HTML page by removing duplicate tooltips
|
2017-11-05 01:00:15 +01:00 |
|
Frédéric FRANCE
|
b58df17545
|
default currency on propal create
|
2017-11-02 18:14:55 +01:00 |
|
Laurent Destailleur
|
15272f6555
|
Return error code
|
2017-11-02 13:47:53 +01:00 |
|
Laurent Destailleur
|
202712be94
|
Work on module builder
|
2017-10-25 22:02:07 +02:00 |
|
Laurent Destailleur
|
58584d8784
|
Update fournisseur.commande.class.php
|
2017-10-24 13:05:12 +02:00 |
|
dolibarr95
|
76aa2df807
|
Try to fix #7692
`$this->fk_soc` is empty replace by `$this->socid`
|
2017-10-24 13:05:05 +02:00 |
|
Laurent Destailleur
|
169d454811
|
Update fournisseur.commande.class.php
|
2017-10-24 13:01:48 +02:00 |
|
dolibarr95
|
a3dfbf854a
|
Try to fix #7692
`$this->fk_soc` is empty replace by `$this->socid`
|
2017-10-24 09:22:13 +02:00 |
|
Laurent Destailleur
|
c6e5115d34
|
Set default limit to 100 on all rest api that list
|
2017-10-22 15:42:19 +02:00 |
|
Laurent Destailleur
|
98674f6d82
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/facture/card.php
htdocs/societe/class/api_contacts.class.php
htdocs/societe/class/api_thirdparties.class.php
|
2017-10-22 15:01:35 +02:00 |
|
Laurent Destailleur
|
703d4a6aee
|
FIX #7648
|
2017-10-22 14:02:24 +02:00 |
|
Laurent Destailleur
|
c9fceaad3c
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/index.php
htdocs/fourn/facture/card.php
|
2017-10-22 04:04:26 +02:00 |
|
Laurent Destailleur
|
728e36f70f
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/api/index.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/class/api_invoices.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/actions_sendmails.inc.php
|
2017-10-22 01:43:33 +02:00 |
|
Frédéric FRANCE
|
8baad70f6c
|
stock on supplier invoice back to draft
|
2017-10-21 20:26:32 +02:00 |
|
Laurent Destailleur
|
f7556e7ad2
|
FIX make of link to other object during creation
|
2017-10-19 19:06:48 +02:00 |
|
Laurent Destailleur
|
d4ade7b935
|
FIX API to get object does not return data o flinked objects
|
2017-10-19 17:57:16 +02:00 |
|
Laurent Destailleur
|
99239cbb38
|
Add API close to close an order
|
2017-10-18 15:34:03 +02:00 |
|
Laurent Destailleur
|
d70c215ab8
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/bank/bankentries.php
htdocs/fourn/facture/card.php
|
2017-10-17 11:14:58 +02:00 |
|
Laurent Destailleur
|
5937fba373
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-10-17 10:51:11 +02:00 |
|
Laurent Destailleur
|
e40bffb0d5
|
Fix bug reported by scrutinizer
|
2017-10-07 20:21:47 +02:00 |
|
Laurent Destailleur
|
66978a3bb4
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
|
2017-10-07 13:44:27 +02:00 |
|
Scrutinizer Auto-Fixer
|
328d39bc71
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2017-10-07 11:09:31 +00:00 |
|
Laurent Destailleur
|
74deb05527
|
Clean code. Use constant for status of supplier order process.
|
2017-10-07 13:04:31 +02:00 |
|
Laurent Destailleur
|
f9d9642340
|
FIX #6981
|
2017-10-06 14:07:28 +02:00 |
|
Laurent Destailleur
|
ef3d86333c
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/projet/activity/perday.php
|
2017-10-06 12:38:50 +02:00 |
|
Laurent Destailleur
|
337d6d9f08
|
Merge pull request #7565 from tarrsalah/fix_supplier_payment_builddoc
Fix supplier payment builddoc
|
2017-10-06 01:55:48 +02:00 |
|
tarrsalah
|
76efc31b00
|
WIP fix supplier payement modelpath.
|
2017-10-05 09:51:17 +01:00 |
|
Laurent Destailleur
|
56acb2c08c
|
Fix: with 5.0 and 6.0, supplier prices are always in main currency. The currency is not yet available in supplier prices.
Field to define the currency of supplier prices were added in database but not yet used by screen/code.
|
2017-10-05 10:38:58 +02:00 |
|
Laurent Destailleur
|
ded55f41fb
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/commonobject.class.php
|
2017-10-04 16:08:22 +02:00 |
|
Laurent Destailleur
|
69c47aa7d9
|
Fix sql error
|
2017-10-04 15:22:55 +02:00 |
|
Laurent Destailleur
|
d28188d19d
|
FIX Generation of invoice from bulk action "Bill Orders"
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
|
2017-10-04 14:31:52 +02:00 |
|
Laurent Destailleur
|
a74d6074a3
|
FIX Generation of invoice from bulk action "Bill Orders"
|
2017-10-04 14:27:10 +02:00 |
|
Laurent Destailleur
|
c22cd1cfe9
|
Fix test on entity must always be done using the "IN" instead of "="
|
2017-10-03 17:41:22 +02:00 |
|
Laurent Destailleur
|
f2e0ff0d30
|
Merge branch 'develop_dict' of https://github.com/hregis/dolibarr into hregis-develop_dict
|
2017-10-03 17:25:01 +02:00 |
|
Laurent Destailleur
|
9d6498f2a4
|
NEW Search filters in lists are restored when using "back to list"
|
2017-10-03 14:50:52 +02:00 |
|
Regis Houssin
|
9823d6622c
|
Fix: use default $shared value
|
2017-09-27 17:40:02 +02:00 |
|
Regis Houssin
|
20684b4505
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/core/modules/rapport/pdf_paiement.class.php
htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
|
2017-09-27 17:22:18 +02:00 |
|
Laurent Destailleur
|
f1a563625b
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
|
2017-09-26 22:11:00 +02:00 |
|
Laurent Destailleur
|
49982b36ac
|
FIX #7490
|
2017-09-26 11:55:19 +02:00 |
|
Laurent Destailleur
|
5482f80c0e
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-09-26 10:30:47 +02:00 |
|
Laurent Destailleur
|
59571b1ce1
|
FIX #7473 Mass update of vat rates and other bugs on localtax
|
2017-09-26 10:29:44 +02:00 |
|
Laurent Destailleur
|
c9e9f60f8f
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2017-09-25 19:55:52 +02:00 |
|
Laurent Destailleur
|
270aba99fa
|
FIX #7471
|
2017-09-24 23:28:48 +02:00 |
|
Regis Houssin
|
77fea1983c
|
Fix: wrong supplier product price id
|
2017-09-20 16:57:38 +02:00 |
|
Regis Houssin
|
db17eb80ec
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/compta/facture/class/paymentterm.class.php
|
2017-09-15 16:45:49 +02:00 |
|
Laurent Destailleur
|
5e34b121dd
|
Add more robust php unit to detect not escaped sql. Fix not escaped sql
|
2017-09-15 15:41:07 +02:00 |
|
Laurent Destailleur
|
6aeeb0bd73
|
Merge pull request #7388 from reeperbahnause/patch-3
FIX #7349 Change Class from Invoices to SupplierInvoices
|
2017-09-14 12:16:59 +02:00 |
|
Regis Houssin
|
a494e01f00
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
|
2017-09-14 12:07:19 +02:00 |
|
Laurent Destailleur
|
eadfbfe2bd
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions2.lib.php
|
2017-09-13 20:57:53 +02:00 |
|
Laurent Destailleur
|
f2cd96b9c0
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
ChangeLog
htdocs/adherents/class/adherent.class.php
htdocs/core/lib/price.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/supplier_proposal/list.php
|
2017-09-13 20:55:22 +02:00 |
|
reeperbahnause
|
317c5ace3c
|
FIX #7349 Change Class from Invoices to SupplierInvoices
FIX #7349 Change Class from Invoices to SupplierInvoices
|
2017-09-12 22:32:07 +02:00 |
|
Maxime Kohlhaas
|
0608778b9c
|
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
|
2017-09-12 11:00:28 +02:00 |
|
Juanjo Menent
|
7648d300b5
|
FIX: Bad link to unpayed suppliers invoices
|
2017-09-07 17:13:48 +02:00 |
|
Maxime Kohlhaas
|
c3152a6343
|
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
|
2017-08-28 10:32:04 +02:00 |
|
Regis Houssin
|
1befd9c67f
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
|
2017-08-23 21:05:36 +02:00 |
|
Laurent Destailleur
|
90afbcb034
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/bank.php
htdocs/core/lib/functions.lib.php
|
2017-08-23 17:02:53 +02:00 |
|
Laurent Destailleur
|
f3ef6448d7
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/admin/supplier_payment.php
htdocs/core/lib/ajax.lib.php
htdocs/don/admin/donation.php
htdocs/product/admin/product.php
|
2017-08-23 16:11:51 +02:00 |
|
Laurent Destailleur
|
52a8692a85
|
FIX #7226
|
2017-08-23 16:07:11 +02:00 |
|
Laurent Destailleur
|
4da49dfc2d
|
FIX #7239
|
2017-08-23 15:02:38 +02:00 |
|
Regis Houssin
|
2f537a1ade
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/compta/charges/index.php
htdocs/compta/paiement/list.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
|
2017-08-22 18:49:40 +02:00 |
|
Laurent Destailleur
|
681623c3ab
|
Merge branch 'develop' into patch-1
|
2017-08-22 11:43:25 +02:00 |
|
Laurent Destailleur
|
30c39d246b
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-08-22 11:18:56 +02:00 |
|
Laurent Destailleur
|
206d46cbb7
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
scripts/cron/cron_run_jobs.php
|
2017-08-22 11:18:17 +02:00 |
|
Laurent Destailleur
|
41ce4886fd
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-08-22 11:15:30 +02:00 |
|
fappels
|
ca3cdfabec
|
FIX Best buy price calculation
Best buy price also depends on buy discount.
|
2017-08-09 14:15:26 +02:00 |
|
Regis Houssin
|
0dc0fe81fc
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-07-31 07:40:01 +02:00 |
|
Laurent Destailleur
|
80f096a9d8
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-07-31 02:09:15 +02:00 |
|
Laurent Destailleur
|
60493d0a47
|
Several fixes (permission, missing method or class) in REST APIs
|
2017-07-28 11:03:30 +02:00 |
|
Regis Houssin
|
c8bd11660d
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
|
2017-07-18 15:23:43 +02:00 |
|
Laurent Destailleur
|
a416ec4258
|
Try to fix travis
|
2017-07-18 14:25:07 +02:00 |
|
Regis Houssin
|
200f232164
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-07-16 07:51:20 +02:00 |
|
Laurent Destailleur
|
3ac85e10c5
|
NEW Add mass action "validate" on supplier invoices.
NEW Add date_valid and date_pointoftax on supplier invoices.
|
2017-07-14 14:40:09 +02:00 |
|
Regis Houssin
|
cb6b81d897
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
|
2017-07-11 19:10:22 +02:00 |
|
Laurent Destailleur
|
9f486716c1
|
Fix phpcs
|
2017-07-08 14:56:43 +02:00 |
|
Laurent Destailleur
|
de24e93cca
|
Merge pull request #7097 from fappels/develop_nbr_suppliers_prod_list
NEW: Add column with nbr suppliers prices and WAP to product list.
|
2017-07-07 19:42:25 +02:00 |
|
Laurent Destailleur
|
252d8da8fc
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2017-07-07 15:11:53 +02:00 |
|
Maxime Kohlhaas
|
f8ad108da6
|
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
|
2017-07-07 12:07:35 +02:00 |
|
Laurent Destailleur
|
d55213286e
|
Fix missing parameter
|
2017-06-30 11:40:26 +02:00 |
|
fappels
|
574590a598
|
Add minimum qty column
|
2017-06-30 10:55:45 +02:00 |
|
fappels
|
d0599cd952
|
Revert "WAP alway decimal 2 digits"
This reverts commit 7d4a093d9e.
|
2017-06-30 10:54:04 +02:00 |
|
fappels
|
7d4a093d9e
|
WAP alway decimal 2 digits
|
2017-06-30 10:52:54 +02:00 |
|
fappels
|
e3f7402e07
|
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_nbr_suppliers_prod_list
|
2017-06-26 22:45:18 +02:00 |
|
fappels
|
13e5c8ff7a
|
Create patch
Add Number of supplier prices and wap columns
|
2017-06-26 22:44:56 +02:00 |
|
Regis Houssin
|
3445c9d329
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_dict
Conflicts:
htdocs/core/lib/functions.lib.php
|
2017-06-11 06:27:49 +02:00 |
|
atm-ph
|
039130c694
|
Fix travis
|
2017-06-10 16:19:33 +02:00 |
|
atm-ph
|
5dfb988cb1
|
Fix 6944 compatibility PHP7 and missing parameter to call delete function
|
2017-06-10 13:34:28 +02:00 |
|
Regis Houssin
|
fa58f0f3e8
|
Fix: add entity filter
|
2017-06-09 09:25:15 +02:00 |
|
Regis Houssin
|
5c5663c5ae
|
New: getEntity function use true $shared value by default
|
2017-05-30 18:50:54 +02:00 |
|
Maxime Kohlhaas
|
6ac08c3bee
|
Fix : Product supplier price is related to supplier's currency
|
2017-05-29 10:32:17 +02:00 |
|
Laurent Destailleur
|
f5e29d6c86
|
Fix phpcs warning
|
2017-05-22 10:45:02 +02:00 |
|
Laurent Destailleur
|
e2a7b0943f
|
Clean dead code
|
2017-05-17 14:52:27 +02:00 |
|
Laurent Destailleur
|
fa290c34fa
|
Fix against SQL injection. Add phpunit to detect missing escapement.
|
2017-05-12 16:55:11 +02:00 |
|
Benoit
|
23af50ad2a
|
Add fk_facture_fourn element to fetch lines objects
|
2017-05-10 22:45:41 +02:00 |
|
Benoit
|
0fbf27895a
|
Add fk_facture_fourn element to fetch lines objects
|
2017-05-05 22:33:34 +02:00 |
|