Laurent Destailleur
4043356f3a
Update card.php
2019-11-22 14:25:32 +01:00
gauthier
a8d02615a8
FIX : we need to be able to recalculate tva only if invoice not ventil
2019-11-21 14:58:20 +01:00
Frédéric FRANCE
d182eee4bf
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-19 23:26:00 +01:00
Laurent Destailleur
fb70893229
Fix missing class reposition
2019-11-19 21:29:49 +01:00
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-18 17:45:52 +01:00
Laurent Destailleur
2689f7515c
Fix pb with colspan and extrafields.
...
Fix remove empty id
2019-11-16 14:38:05 +01:00
Frédéric FRANCE
6784ea9fae
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-16 09:21:57 +01:00
Laurent Destailleur
1f5bea01f5
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
htdocs/user/card.php
2019-11-14 21:30:16 +01:00
Laurent Destailleur
7e52c70321
FIX Advisory ID: usd20190067
2019-11-14 21:16:18 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:15 +00:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-14 09:21:26 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:06 +01:00
Frédéric FRANCE
446c66da62
use class CONST
2019-11-14 08:15:39 +01:00
Scrutinizer Auto-Fixer
b40ecc3933
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:02 +00:00
Scrutinizer Auto-Fixer
c85e54b08c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-12 08:46:08 +00:00
Scrutinizer Auto-Fixer
df664e790b
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-11 23:15:34 +00:00
Laurent Destailleur
b4d40da768
Clean params
2019-11-11 13:32:36 +01:00
Laurent Destailleur
28b10e4610
Merge pull request #12379 from altatof/dispatch_force_qty_input
...
NEW : add constant DISPATCH_FORCE_QTY_INPUT
2019-11-08 11:38:57 +01:00
Laurent Destailleur
52e90a8d91
Update dispatch.php
2019-11-08 11:38:08 +01:00
Scrutinizer Auto-Fixer
2ecfe41810
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-08 09:53:31 +00:00
altairis
c574f5990f
add constant DISPATCH_FORCE_QTY_INPUT
2019-11-07 14:31:30 +01:00
Laurent Destailleur
f84087ba70
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-07 14:08:01 +01:00
Laurent Destailleur
1fa61077a0
FIX #12356
2019-11-07 14:07:50 +01:00
Frédéric FRANCE
001010d5e3
fix phpcs
2019-11-07 12:43:33 +01:00
Laurent Destailleur
af2df62aaa
Merge branch 'develop' into patch-7
2019-11-07 11:23:17 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent
2019-11-05 21:24:41 +01:00
Frédéric FRANCE
d2e59fc2af
css
2019-11-05 21:14:22 +01:00
Laurent Destailleur
94bd0f71d9
Fix pb with permission
2019-11-05 19:41:30 +01:00
Laurent Destailleur
9e9d88f28c
Fix stats on tickets
2019-11-05 16:06:08 +01:00
Laurent Destailleur
7ab19ef66b
Fix selection not lose if creation of vendor invoice fails
2019-11-05 13:34:25 +01:00
Laurent Destailleur
ce1dec253f
FIX #11364
2019-11-05 12:47:38 +01:00
Laurent Destailleur
1aef1c60dd
Merge pull request #11867 from frederic34/socialnetworks
...
NEW add socialnetworks dictionary
2019-11-04 21:10:22 +01:00
Laurent Destailleur
ec8bd6327d
Fix css
2019-11-04 18:53:46 +01:00
Laurent Destailleur
11500fb8d9
FIX confusion between permto... and permisstionto...
2019-11-04 15:33:49 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-11-03 21:48:24 +01:00
Laurent Destailleur
630a150b09
Fix multicurrency rate must be visible if currency differs only
2019-11-03 17:48:16 +01:00
Laurent Destailleur
ab7c300f43
NEW Can change supplier when cloning a Purchase Order
2019-11-02 20:50:25 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid
...
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00
Laurent Destailleur
58ffb73627
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-02 12:59:49 +01:00
Laurent Destailleur
45c77b4560
Renaming some libelle into label
2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid
2019-11-02 12:01:06 +01:00
Laurent Destailleur
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019
...
add comment
2019-11-02 11:49:28 +01:00
Laurent Destailleur
7e6732c11b
Merge pull request #12263 from defrance/patch-144
...
fix: delete function optional and id value
2019-11-02 11:49:04 +01:00
Laurent Destailleur
68c971a2b5
All properties 'type_libelle' were renamed into 'type_label'.
2019-11-02 11:12:57 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-02 09:14:15 +01:00
Scrutinizer Auto-Fixer
50f55cac35
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-02 00:17:45 +00:00
Laurent Destailleur
cea2c3a9f4
Look and feel v11
2019-11-01 23:58:14 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-01 21:39:20 +01:00
Laurent Destailleur
a1700e71be
Fix phpcs
2019-10-31 21:18:38 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid
2019-10-31 20:46:31 +01:00
Frédéric FRANCE
f7747ed00a
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-30 20:06:43 +01:00
Philippe GRAND
ccb957623c
add some comment
2019-10-30 10:00:52 +01:00
Laurent Destailleur
6769efc372
Merge pull request #12234 from frederic34/patch-17
...
Update list.php
2019-10-30 03:00:03 +01:00
Laurent Destailleur
66a288a343
Merge pull request #12235 from frederic34/scopeindent
...
clean indent
2019-10-30 02:57:59 +01:00
Laurent Destailleur
7e4ceeb08a
Merge pull request #12244 from TobiasSekan/FixInvoiceSupplierCountArray
...
Fix count array for invoice supplier
2019-10-30 02:51:06 +01:00
BENKE Charlene
1b7e138e01
fix: delete function optional and id value
2019-10-29 17:27:30 +01:00
Tobias Sekan
ed813b872f
Fix count array for invoice supplier
2019-10-28 10:40:07 +01:00
Frédéric FRANCE
b2b057e9b5
clean indent
2019-10-27 09:51:15 +01:00
Frédéric FRANCE
d6045cdb78
Update list.php
2019-10-26 13:28:06 +02:00
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-25 08:12:54 +02:00
Laurent Destailleur
2201b11fd3
NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_PROPOSAL
...
NEW Add option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL
2019-10-24 13:41:04 +02:00
Laurent Destailleur
b88968520b
Move code of extrafields to the new architecture
2019-10-22 17:08:37 +02:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-17 20:24:04 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Laurent Destailleur
8da0cd4a35
Merge branch 'develop' into patch-13
2019-10-16 13:32:31 +02:00
Laurent Destailleur
e07e01580d
Replace deprecated code with new one
2019-10-16 03:34:32 +02:00
Frédéric FRANCE
d1d9b1ed85
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-15 09:39:57 +02:00
Laurent Destailleur
fb3d20107c
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/exports/export.php
htdocs/filefunc.inc.php
2019-10-15 03:51:57 +02:00
Laurent Destailleur
65b6bc26ba
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/facture/list.php
2019-10-14 23:54:24 +02:00
Laurent Destailleur
ee5fdc3239
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-10-14 23:52:58 +02:00
Laurent Destailleur
0fe3159a8a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/fourn/facture/list.php
2019-10-14 23:52:46 +02:00
Frédéric FRANCE
b88059433c
Update list.php
2019-10-14 21:36:38 +02:00
Frédéric FRANCE
45b3d623bb
Update list.php
2019-10-14 20:30:31 +02:00
JC Prieto
d109341ebe
Update card.php
...
Variable $mesg not do anything
2019-10-11 18:08:15 +02:00
Frédéric FRANCE
367ef4acaf
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-11 16:44:25 +02:00
Frédéric FRANCE
03bbfc6ad9
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-10 23:24:50 +02:00
Frédéric FRANCE
43c7917108
Update fournisseur.commande.class.php
2019-10-09 23:59:12 +02:00
Laurent Destailleur
072a0a26d6
Use a font awesome icon to show "shippable" flag on orders.
2019-10-09 18:07:00 +02:00
Frédéric FRANCE
f253315c8d
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-08 18:30:58 +02:00
Laurent Destailleur
94905ebbec
css
2019-10-08 11:56:38 +02:00
Laurent Destailleur
43a70e5548
Clean code to use the new $extrafields->attributes array
2019-10-08 09:28:50 +02:00
Frédéric FRANCE
b78187c1eb
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-08 00:07:27 +02:00
Laurent Destailleur
f56da782ab
Merge pull request #12038 from Ahuahuachi/develop
...
NEW Add hidden options to send by email even for draft status
2019-10-07 14:18:53 +02:00
Laurent Destailleur
1060ac4608
Merge pull request #12035 from atm-john/develop_fix_missing_dolgetstatus
...
Fix : LibStatut missing dolgetstatus usage
2019-10-07 13:08:33 +02:00
Frédéric FRANCE
ec8569dd85
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-06 15:56:21 +02:00
Laurent Destailleur
866dcf18fe
Look and feel v11
2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61
NEW Code for extrafields uses the new array $extrafields->attributes
2019-10-06 14:41:52 +02:00
Frédéric FRANCE
6384e7eb67
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-05 20:02:16 +02:00
Laurent Destailleur
b883a8092a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/product.lib.php
htdocs/core/tpl/extrafields_list_search_input.tpl.php
htdocs/fourn/facture/card.php
htdocs/product/class/html.formproduct.class.php
2019-10-05 19:35:40 +02:00
altairis
8b8a5e315a
fix test error
2019-10-04 10:55:09 +02:00
altairis
55c0913884
Merge branch 'develop' into fourn
2019-10-04 10:51:28 +02:00
Laurent Destailleur
0b9d27423d
FIX Can't modify vendor invoice if transfered into accountancy
2019-10-04 10:31:57 +02:00
Alfredo Altamirano
140784d741
Merge remote-tracking branch 'Dolibarr/develop' into develop
2019-10-03 20:32:26 -05:00
Alfredo Altamirano
b6882af1b6
Add hidden options to send by email for all status
2019-10-03 20:21:13 -05:00
ATM john
35c6008e1a
Fix supplier order libStatus to use new dolGetStatus
2019-10-03 21:58:23 +02:00
Laurent Destailleur
1a66e0b05e
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/product/card.php
2019-10-03 17:53:59 +02:00
Laurent Destailleur
75be637b0b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-03 17:50:57 +02:00
Frédéric FRANCE
e443538f71
wip
2019-10-03 17:23:50 +02:00
atm-lena
ae01bd8f07
FIX missing begin()
2019-10-03 17:23:16 +02:00
Laurent Destailleur
24570f7165
Look and feel v11. Picto are fontawesome.
2019-10-02 18:14:41 +02:00
Laurent Destailleur
ce090d43a0
Close #8907
2019-10-01 15:01:29 +02:00
Alexandre SPANGARO
16c6c9ae75
Merge remote-tracking branch 'upstream/develop' into 11.0_https
2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd
Merge branch 'develop' into 11.0_https
2019-10-01 06:11:43 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon
...
NEW Add fa_icon on load_fiche_titre
2019-09-30 15:26:28 +02:00
Alexandre SPANGARO
aec50d3ac9
NEW Add fa_icon on load_fiche_titre
2019-09-30 10:14:55 +02:00
Laurent Destailleur
6966651d51
Standardize code to use dolSqlDateFilter
2019-09-28 13:22:05 +02:00
Laurent Destailleur
c0e7c558a1
Merge pull request #11860 from atm-john/new_box_supplier_orders_awaiting_reception
...
NEW widget box for supplier orders awaiting reception
2019-09-27 15:32:43 +02:00
Laurent Destailleur
f5c839217a
Merge pull request #11914 from fmarcet/develop
...
Fix: Load invoices only if showed
2019-09-27 14:34:16 +02:00
Laurent Destailleur
72ea1a2867
Merge pull request #11927 from OPEN-DSI/fix-fournisseur-product-display-histo-tooltip
...
FIX dol_print_date format in buying price tooltip
2019-09-27 12:25:26 +02:00
Laurent Destailleur
961f2b5165
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/viewcat.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/takepos/invoice.php
2019-09-24 14:25:02 +02:00
Laurent Destailleur
5838fa1229
Fix az09 -> aZ09
2019-09-24 14:20:45 +02:00
Laurent Destailleur
6431e8e16d
FIX SQL injection on qty
2019-09-24 12:43:44 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
VESSILLER
cf7193691f
FIX dol_print_date format in buying price tooltip
2019-09-18 11:22:32 +02:00
Ferran Marcet
81d8055a9c
New: Load invoices only if showed
2019-09-17 09:43:15 +02:00
Laurent Destailleur
80f498f206
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-09-14 19:25:52 +02:00
Laurent Destailleur
bbb62f27c7
Update doc
2019-09-14 19:25:09 +02:00
Laurent Destailleur
9f6fe0bf5a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/orders.lang
2019-09-14 18:27:58 +02:00
Laurent Destailleur
3caa1bd43c
FIX Debug feature orderstoinvoice for suppliers
2019-09-14 18:21:37 +02:00
Laurent Destailleur
844f0903da
Fix missing fields
2019-09-14 17:34:57 +02:00
ATM john
337194023a
Add purchase orders awaiting reception to workboard
2019-09-10 22:10:20 +02:00
Laurent Destailleur
1d74387125
Removed deprecated property ->numero (We must use ->num_payment)
2019-09-09 08:47:23 +02:00
Laurent Destailleur
30d2f84eb7
Remove a label that is no more used
2019-09-07 10:58:20 +02:00
Laurent Destailleur
a481fac289
Merge pull request #11793 from altatof/supplierorderstatus
...
Differentiate supplier orders status
2019-09-07 10:54:03 +02:00
Laurent Destailleur
09d6826e62
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/supplier_order.php
htdocs/langs/en_US/admin.lang
2019-09-06 14:27:01 +02:00
Laurent Destailleur
529dd05226
Replace deprecated code
2019-09-06 10:53:05 +02:00
Laurent Destailleur
16484e1fa3
Fix balance of td
2019-09-06 02:22:44 +02:00
Laurent Destailleur
80daf29d79
Fix conflict between new module reception and old process
...
Fix inventory record does not need status at creation
Conflicts:
htdocs/fourn/commande/card.php
2019-09-06 01:55:22 +02:00
Laurent Destailleur
04adbd8c80
Fix conflict between new module reception and old process
...
Fix inventory record does not need status at creation
2019-09-06 01:52:51 +02:00
Laurent Destailleur
92e7d7bb26
Fix duplicate translation
2019-09-05 16:18:20 +02:00
Christophe Battarel
754897604f
merge develop
2019-09-05 15:47:58 +02:00
Christophe Battarel
0bf70dddc7
actualize from develop
2019-09-05 15:33:16 +02:00
Christophe Battarel
dff36c9d68
actualize from develop
2019-09-05 15:30:14 +02:00
Laurent Destailleur
f7ce723686
Merge pull request #11800 from jtraulle/fix-11427-10.0
...
FIX #11427 require product class (fixes POST /supplierinvoices REST API endpoint)
2019-09-03 12:56:00 +02:00
Laurent Destailleur
98459363df
Merge pull request #11795 from jtraulle/fix-doxygen-examples
...
Fix Wrongly catched examples by Doxygen
2019-09-03 12:45:23 +02:00
Laurent Destailleur
a269082d70
Replace deprecated code with new one
2019-09-02 03:58:00 +02:00
Jean Traullé
237c29d428
FIX #11427 require product class
...
Fixes POST /supplierinvoices REST API endpoint
2019-08-31 00:07:14 +02:00
Jean Traullé
c32c7d48ba
Fix Wrongly catched examples by Doxygen
2019-08-30 17:14:59 +02:00
Christophe Battarel
8c8844d7ae
Differentiate supplier orders status
2019-08-30 09:33:01 +02:00
Laurent Destailleur
999db7ed41
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/salaries/card.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/takepos/invoice.php
2019-08-26 16:49:25 +02:00
Laurent Destailleur
c93e6550ce
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/compta/sociales/class/chargesociales.class.php
2019-08-26 16:43:24 +02:00
Laurent Destailleur
dcfbba9af5
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/compta/sociales/class/chargesociales.class.php
2019-08-26 16:41:06 +02:00
Laurent Destailleur
b7e7ca46b5
Fix responsive
2019-08-23 14:01:13 +02:00
Christophe Battarel
7c3e643fca
fix PSR2 missing space
2019-08-22 16:07:18 +02:00
Laurent Destailleur
3f105a97bf
Debug the new workboard
2019-08-18 04:56:48 +02:00
Laurent Destailleur
5351d78a96
Merge branch 'develop' into develop_new_dashboard
2019-08-18 01:26:56 +02:00
Laurent Destailleur
b8406f842d
Merge pull request #10655 from atm-quentin/FIX_credit_note_used_on_list
...
Fix total on list and amount opened on thirdparty card (for supplier)
2019-08-15 21:14:03 +02:00
Laurent Destailleur
7035bf88ca
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-15 19:52:01 +02:00
Laurent Destailleur
f1a63fd51b
Merge pull request #11684 from jtraulle/fix-rest-api-supplierinvoices-post-with-lines-fk_product
...
FIX #11427 require product class (fixes POST /supplierinvoices REST API endpoint)
2019-08-15 19:51:12 +02:00
Laurent Destailleur
f26a13ff13
NEW Removed deprecated code that create linked object from ->origin
2019-08-15 19:50:18 +02:00
Jean Traullé
c739b95666
Fix codestyle
...
lessc.class.php should be excluded from ruleset as it is an external lib
2019-08-14 23:33:06 +02:00
Jean Traullé
003642fe10
Preserve spaces instead of tabs for indentation.
2019-08-14 23:07:18 +02:00
Jean Traullé
1d2c2f8551
NEW Add payments GET and POST REST API endpoints for supplierinvoices.
2019-08-14 23:00:40 +02:00
Jean Traullé
b90815b972
FIX require product class (fixes POST /supplierinvoices REST API endpoint)
...
When passing a fk_product field into a supplier invoice line on the POST /supplierinvoices REST API endpoint, we need to require the product class first in fournisseur.facture.class.php to be able to load the Product from the passed id.
2019-08-13 16:36:41 +02:00
John Botella
b4c4e5a662
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard
2019-08-02 14:52:01 +02:00
Laurent Destailleur
d7a41c6b72
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
2019-08-01 12:54:27 +02:00
John Botella
9b84987cc1
prepare new dashboard
2019-08-01 12:33:19 +02:00
Laurent Destailleur
5eb8f05061
FIX #11584
2019-08-01 12:23:02 +02:00
Laurent Destailleur
9a60fac9d1
Merge pull request #11564 from simnandez/develop
...
NEW: Add hidden option for update supplier buying in receptions
2019-07-30 21:43:03 +02:00
Laurent Destailleur
aba9eafeea
Update dispatch.php
2019-07-30 21:42:53 +02:00
Laurent Destailleur
11e3aa5860
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-29 11:07:11 +02:00
Laurent Destailleur
7931f0b422
Fix sql error
2019-07-29 11:06:39 +02:00
Laurent Destailleur
a5e3adc6f1
Fix travis
2019-07-29 10:51:17 +02:00
Laurent Destailleur
db461792a0
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-29 01:36:35 +02:00
Laurent Destailleur
9a7113f4f5
FIX Update the file index table when we validate/rename a ref.
2019-07-28 22:26:55 +02:00
Laurent Destailleur
9f7d118f6f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-27 02:40:56 +02:00
Laurent Destailleur
2867e31a63
Fix CSS
2019-07-27 01:13:39 +02:00
Juanjo Menent
38bb046abb
NEW: Add hidden option SUPPLIER_ORDER_CAN_UPDATE_BUYINGPRICE_DURING_RECEIPT for add possibility to update supplier buying price in the reception on a supplier order
2019-07-26 12:38:49 +02:00
Laurent Destailleur
50480bf517
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/opensurvey/index.php
2019-07-18 18:23:24 +02:00
Laurent Destailleur
3cffd70ed3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/prelevement/create.php
htdocs/core/class/commonobject.class.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/commande/dispatch.php
htdocs/fourn/product/list.php
htdocs/opensurvey/index.php
htdocs/ticket/index.php
htdocs/ticket/list.php
2019-07-18 18:09:37 +02:00
Laurent Destailleur
5e204f0f67
Merge
2019-07-18 17:51:32 +02:00
Laurent Destailleur
b044d95acf
Merge
2019-07-18 17:50:15 +02:00
Laurent Destailleur
f53f314211
Update fournisseur.product.class.php
2019-07-18 17:15:50 +02:00
Christophe Battarel
5daf0316f9
also fix bad insert sql command
2019-07-18 11:18:25 +02:00
Christophe Battarel
32bc8a5faf
FIX fournrprice log for insert
2019-07-18 11:05:51 +02:00
gauthier
c72a59ad36
FIX : we need to be able to add freeline with qty between 0 & 1 in supplierorder line
2019-07-16 14:55:19 +02:00
atm-florian.m
8aa147a4e5
# missing hooks from dispatch.php and list.php
2019-07-15 11:59:22 +02:00
atm-florian.m
ae540cb25e
FIX: add missing hook calls
2019-07-15 11:59:22 +02:00
Laurent Destailleur
f5cc29417d
Translation lignes -> lines
2019-07-05 21:50:35 +02:00
Laurent Destailleur
0a7d70829f
Translation of some comments
2019-07-05 21:37:25 +02:00
Laurent Destailleur
d3b4a91f41
NEW Can enter price tax incl on vendor proposal and purchase orders
2019-07-05 20:24:22 +02:00
Laurent Destailleur
bbb5b43e94
Fix duplicate trans
2019-07-05 19:03:16 +02:00
Laurent Destailleur
ee109ac568
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-05 17:44:50 +02:00
Laurent Destailleur
ed39849d33
Fix css
2019-07-04 16:14:10 +02:00
Laurent Destailleur
4e00cfb455
Clean code
2019-07-04 16:02:04 +02:00
Laurent Destailleur
d405a58999
Merge pull request #11424 from OPEN-DSI/issue-fourn-commande-card-makeorder
...
NEW The order method in purchase order is now mandatory when registering the order
2019-07-04 15:52:51 +02:00
Laurent Destailleur
1de499a320
Update card.php
2019-07-04 15:52:03 +02:00
Laurent Destailleur
9405ce335e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-04 15:43:43 +02:00
Laurent Destailleur
657a3ae4c5
FIX permission to delete a draft purchase order
2019-07-04 12:43:32 +02:00
Laurent Destailleur
2fee41f712
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-04 12:27:00 +02:00
Laurent Destailleur
69e0353e12
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-07-04 12:26:26 +02:00
Laurent Destailleur
8e3620fce1
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/facture/invoicetemplate_list.php
2019-07-04 12:26:17 +02:00
Laurent Destailleur
ee0a65e7fa
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/comm/action/card.php
2019-07-04 12:22:40 +02:00
atm-florian.m
3e53a06b2e
minor spelling issues
2019-07-03 16:17:47 +02:00
Alexandre SPANGARO
ab7cb7bb2e
FIX Nowrap on amount
2019-07-02 12:01:50 +02:00
Laurent Destailleur
adb3062a9f
Work on nblignes -> nblines
2019-06-29 16:38:14 +02:00
VESSILLER
f4978e9473
FIX/NEW - Force mandatory order method
2019-06-28 10:58:31 +02:00