lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
91,219 Commits 43 Branches 150 Tags 886 MiB
scrutinizer-patch-1
Commit Graph

4832 Commits

Author SHA1 Message Date
Laurent Destailleur
2c4fd099c8
Update fournisseur.product.class.php 2019-12-14 22:27:45 +01:00
Laurent Destailleur
e9a0646f6f
Update fournisseur.product.class.php 2019-12-14 22:25:34 +01:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
 2019-12-14 14:53:49 +01:00
gauthier
cc1454c8d5 FIX : product_fourn_price_id was assigned too late for logPrice() function 2019-12-13 14:55:39 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-13 14:36:00 +01:00
Frédéric FRANCE
2136499c67
The variable $query seems to be never defined 2019-12-12 20:11:18 +01:00
gauthier
a0aa51fe0c FIX : CommandeFournisseurLigne update function must not be able to return other value than 1 if success 2019-12-12 16:46:25 +01:00
Frédéric FRANCE
e078bc6f83
doxygen 2019-12-10 08:08:56 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-03 17:56:43 +01:00
Laurent Destailleur
6f7343b14f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-02 11:01:26 +01:00
Laurent Destailleur
6d81bc77cb Fix look and feel v11 2019-12-02 11:00:09 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Frédéric FRANCE
b2912e688b
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-27 22:54:05 +01:00
Frédéric FRANCE
b104133f7a
Update orderstoinvoice.php 2019-11-26 18:29:52 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-26 08:10:40 +01:00
stickler-ci
5d051cc901 Fixing style errors. 2019-11-25 07:08:22 +00:00
atm-greg
5af9784dc9 fix update line 2019-11-25 07:40:29 +01:00
Laurent Destailleur
bc5270ce76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/facture/card.php
 2019-11-24 18:15:25 +01:00
Laurent Destailleur
c7aaed1264 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/fourn/facture/card.php
 2019-11-24 18:14:18 +01:00
Laurent Destailleur
8656143050 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-24 18:13:02 +01:00
Laurent Destailleur
98a7a5559f Fix bad fix 2019-11-24 18:12:40 +01:00
Laurent Destailleur
f2e01834a5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-24 18:11:46 +01:00
Laurent Destailleur
27e4c66dd5 Fix empty 2019-11-24 18:11:11 +01:00
atm-greg
89dd04aa07 implement on supplier_order 2019-11-23 19:05:49 +01:00
atm-greg
ce15af0980 manage packaging on supplier prices 2019-11-23 15:52:34 +01:00
Laurent Destailleur
e4d9f99484 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/remx.php
	htdocs/expedition/card.php
	htdocs/fourn/facture/card.php
 2019-11-22 15:04:40 +01:00
Laurent Destailleur
186a13f101 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/fourn/facture/card.php
 2019-11-22 14:51:13 +01:00
Laurent Destailleur
ece35538f0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-11-22 14:49:29 +01:00
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
Alexandre SPANGARO
2c74caff90 WIP 2019-07-22 06:56:55 +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
VESSILLER
e6ee1e7041 FIX Force order method in order supplier before making order 2019-06-27 14:21:38 +02:00
Laurent Destailleur
51a1550dbb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2019-06-25 23:14:49 +02:00
Laurent Destailleur
a2d50eb95a Fix sql regression 2019-06-25 18:12:12 +02:00
Laurent Destailleur
0c3f524319 Clean code 2019-06-25 16:12:16 +02:00
Laurent Destailleur
f6719db4f3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-25 16:09:08 +02:00
Laurent Destailleur
a98ceb584d Fix syntax error 2019-06-25 16:08:01 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
1c924ef17e Fix bad label on supplier invoice 2019-06-25 12:54:02 +02:00
Laurent Destailleur
8cc6c18931 Fix bad label on supplier invoice 2019-06-25 12:53:23 +02:00
Laurent Destailleur
3c6d271c67 Removed deprecated fields 2019-06-25 12:42:36 +02:00
Laurent Destailleur
a7bd734ece Rename ->produit into ->product. Still permissions to rename. 2019-06-24 21:18:49 +02:00
Laurent Destailleur
4f9aa4caac Fix phpcs 2019-06-20 13:53:31 +02:00
Laurent Destailleur
e9da44e023 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 12:33:02 +02:00
Laurent Destailleur
1a6dc83d4c Fix: default accounting account for eec and export sales were not used. 2019-06-20 12:25:58 +02:00
Laurent Destailleur
a264a4766a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 03:45:04 +02:00
Laurent Destailleur
078324811b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2019-06-20 03:43:16 +02:00
Laurent Destailleur
4574ad2eeb Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-20 03:39:48 +02:00
Laurent Destailleur
2372d32436
Merge pull request #11319 from atm-maxime/new_suppinvoice_list_massfilearea 
New : add file area at bottom of supplier invoices list
 2019-06-20 03:12:45 +02:00
Laurent Destailleur
53688e2d0f
Merge pull request #11353 from fmarcet/8.0 
FIX: Wrong stock movement on supplier credit notes
 2019-06-20 03:11:28 +02:00
Laurent Destailleur
4308f48cad
Merge branch 'develop' into MissingHook 2019-06-20 03:04:32 +02:00
Laurent Destailleur
a11c816a17 Fix tooltip 2019-06-19 14:24:48 +02:00
gauthier
3ad13adf31 FIX : better syntax 2019-06-19 10:43:42 +02:00
gauthier
7331e43db8 FIX : we need to fetch fourn invoice with ref in current entity 2019-06-19 10:19:33 +02:00
Nicolas ZABOURI
2e4db8c83c Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook 2019-06-19 08:39:05 +02:00
ICstage
820c420ae5 FIX Missing hooks 2019-06-18 14:07:52 +02:00
Laurent Destailleur
08d5ca4ddb Debug page to export accounting documents 2019-06-17 17:53:43 +02:00
Ferran Marcet
c62f370959 FIX: Wrong stock movement on supplier credit notes 2019-06-17 16:30:56 +02:00
Laurent Destailleur
dac99c878c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/projet/tasks/time.php
 2019-06-17 15:57:06 +02:00
Juanjo Menent
8afffc8762 FIX: #11335 2019-06-14 18:28:01 +02:00
Laurent Destailleur
ff1adb3934 Fix dead code 2019-06-13 22:11:25 +02:00
Laurent Destailleur
52159dcb69 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/html.formother.class.php
 2019-06-13 12:14:19 +02:00
Laurent Destailleur
4b1f0d1ac2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/html.formother.class.php
 2019-06-13 12:11:31 +02:00
Francis Appels
a26c868783 Fix scrutinizer bugs 2019-06-12 22:05:10 +02:00
atm-greg
47746fd17d fix template type 2019-06-12 12:30:49 +02:00
Maxime Kohlhaas
2044847552 New : add file area at bottom of supplier invoices list 2019-06-10 22:33:11 +02:00
Laurent Destailleur
49646663a1 Fix link on invoice 2019-06-07 22:47:15 +02:00
Laurent Destailleur
21a1e0d7b3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/categories/index.php
	htdocs/comm/action/list.php
	htdocs/comm/action/rapport/index.php
	htdocs/compta/paiement.php
	htdocs/compta/sociales/document.php
	htdocs/compta/tva/document.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/facture/paiement.php
	htdocs/loan/document.php
	htdocs/main.inc.php
 2019-06-04 19:03:27 +02:00
Laurent Destailleur
57cfb4b007 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/class/website.class.php
 2019-06-02 12:36:07 +02:00
Maxime Kohlhaas
6dd01e86e9 Fix : avoid warning and uniformize var use 2019-05-31 15:53:23 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Laurent Destailleur
22e897b1a1 Clean and prepare code to fix a SQL injection 2019-05-21 17:22:38 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button 
NEW : look and feel title button
 2019-05-18 16:04:47 +02:00
Laurent Destailleur
c1ec7454a1
Merge branch 'develop' into clean_10_beta 2019-05-16 21:21:51 +02:00
Laurent Destailleur
9f8f45d5bc FIX Payment on supplier invoice should not mix credit note and standard 
invoices.
 2019-05-14 12:00:58 +02:00
Francis Appels
a2d4a59321 Merge branch 'develop' into clean_10_beta 2019-05-13 21:27:13 +02:00
Juanjo Menent
80ef97e215 FIX: #11025 2019-05-11 16:41:01 +02:00
Juanjo Menent
81bf7d07e3 Merge remote-tracking branch 'upstream/7.0' into 7.0 2019-05-11 16:32:02 +02:00
Laurent Destailleur
3def11d5c9 Standardize translation 2019-05-10 19:32:46 +02:00
Laurent Destailleur
a1f0df9a30 Debug receipt module 2019-05-09 17:45:16 +02:00
Laurent Destailleur
1c558c685c Fix class not found 2019-05-09 17:16:35 +02:00
Rüdiger Hahn
acb2f59f56
Fetch db value for cond_reglement_doc/cond_reglement_libelle_doc 
cond_reglement and cond_reglement_doc got the same value cond_reglement_libelle. It looks like that the db field libelle_facture was intended to be used for cond_reglement_libelle_doc.
 2019-05-06 19:22:49 +02:00
Francis Appels
03e2983d40 Merge branch 'develop' into clean_10_beta 2019-05-06 15:22:27 +02:00
Laurent Destailleur
9115df7439 Debug v10 2019-05-03 11:25:53 +02:00
Christophe Battarel
ed12b1855c change entrepot to warehouse 2019-05-01 13:55:27 +02:00
Christophe Battarel
9999ae05cc add default warehouse 2019-05-01 11:10:11 +02:00
Francis Appels
18c5c586ab Cleanup set_draft in syslog 2019-05-01 09:38:27 +02:00
Laurent Destailleur
3007905508 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/core/modules/modService.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/stripe/class/stripe.class.php
 2019-04-30 03:30:40 +02:00
Laurent Destailleur
627ef14454 FIX The autocopy feature was ko for suppliers 2019-04-29 18:51:15 +02:00
Lionel VESSILLER
e80436469f Fix default payment condition and method 2019-04-25 16:05:12 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All 
methods requires the object User as first parameter.
 2019-04-25 12:11:32 +02:00
Laurent Destailleur
68d438b697 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/user/class/user.class.php
 2019-04-25 01:50:48 +02:00
Laurent Destailleur
a15f1350be Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-25 01:39:02 +02:00
Laurent Destailleur
07caf22647 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-04-25 01:37:25 +02:00
atm-greg
70017da95a testing if customer invoice module is activated doesn't make sense on supplier commande card... 2019-04-24 14:59:54 +02:00
Laurent Destailleur
691159c56b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-24 10:24:55 +02:00
Laurent Destailleur
1264857211 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/js/timesheet.js
 2019-04-24 10:24:32 +02:00
atm-greg
6e425d1895 add origin of line in fourn orderstoinvoice.php 2019-04-24 08:56:06 +02:00
Laurent Destailleur
e6ffaeefe5 CSS 2019-04-17 10:39:30 +02:00
John BOTELLA
7372e8c610 Appli function to links 2019-04-15 15:47:36 +02:00
ATM john
292d9c38a5 Appli function to links 2019-04-15 00:21:58 +02:00
Juanjo Menent
1b5cabad71 Fix: #10956 2019-04-12 18:50:48 +02:00
Laurent Destailleur
cf058e7d3b NEW Ask date of invoice when using the Clone feature. 2019-04-12 12:12:08 +02:00
atm-quentin
6deba39c6a FIX credit note can be split 2019-04-12 10:16:13 +02:00
atm-quentin
7ae6472e36 Merge branch '8.0' of github.com:Dolibarr/dolibarr into FIX_credit_note_used_on_list 2019-04-12 09:20:16 +02:00
ATM john
29b31bd7ab New title button first step 2019-04-11 00:38:44 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
fff9b7db9d Fix doxygen 2019-04-04 18:33:12 +02:00
Laurent Destailleur
5891d0a056 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/list.php
	htdocs/projet/list.php
 2019-04-04 17:45:02 +02:00
Laurent Destailleur
37b8796f3c NEW Add line total on list of payments 2019-04-02 17:54:34 +02:00
Laurent Destailleur
2b41d0c59d
Merge pull request #10938 from inoveaconseil/HookPrintFieldLIstFooter 
FIX missing hook
 2019-03-31 18:44:07 +02:00
Laurent Destailleur
0d564cdd6c
Merge pull request #10919 from grandoc/new_branch_26_03_2019 
New branch 26 03 2019
 2019-03-31 18:23:05 +02:00
Laurent Destailleur
ec9fdc1321 Fix regression with class="right". Style of amount lost. 2019-03-31 11:25:29 +02:00
Laurent Destailleur
1b2826f476 Look and feel v10 2019-03-29 13:26:26 +01:00
Nicolas ZABOURI
0ab6b15779 FIX missing hook printFieldListFooter 2019-03-28 17:27:30 +01:00
Laurent Destailleur
a34f4c2806
Merge pull request #10909 from IonAgorria/fix-line-dates 
FIX: Disallow line start date after end date
 2019-03-26 19:43:11 +01:00
Philippe GRAND
c15aa45cdb fix : typo 2019-03-26 12:32:32 +01:00
Philippe GRAND
6c1ee52ac6 fix : typo 2019-03-26 12:31:56 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Ion
7bfa49b29c FIX: Disallow line start date > end date 2019-03-24 14:30:00 +01:00
Laurent Destailleur
28fede950f Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into 
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
 2019-03-22 13:00:48 +01:00
Laurent Destailleur
2b49c0f95e
Merge pull request #10904 from ATM-Nicolas/new_hidden_conf_edit_supplier_on_supplier_order 
NEW Hidden option MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER to edit supplier on draft supplier order
 2019-03-22 12:32:44 +01:00
ATM-Nicolas
742f1cb8af FIX : Show only suppliers 2019-03-22 10:55:49 +01:00
ATM-Nicolas
3149909896 FIX : Update ref_supplier too 2019-03-22 10:29:01 +01:00
ATM-Nicolas
0a23a1157f NEW : Can edit supplier on draft order supplier 2019-03-22 10:28:55 +01:00
Philippe GRAND
77d93099ef translation 2019-03-22 09:44:30 +01:00
Philippe GRAND
b8d04fa076 translation 2019-03-22 09:43:12 +01:00
Philippe GRAND
69906b9888 translation 2019-03-22 09:38:04 +01:00
Laurent Destailleur
ee4150665e Fix phpcs 2019-03-21 20:15:19 +01:00
Laurent Destailleur
5693fbfe97
Merge pull request #10898 from grandoc/new_branch_21_03_2019 
add some comments
 2019-03-21 18:29:11 +01:00
Laurent Destailleur
930720decd WIP Start to replace use of property ->brouillon 2019-03-21 18:13:51 +01:00
Laurent Destailleur
90df30e412 NEW Add trigget FICHINTER_UNVALIDATE 
Standardize code of setDraft.
 2019-03-21 17:37:56 +01:00
Philippe GRAND
6babf88968 add some comments 2019-03-21 15:11:28 +01:00
Frédéric FRANCE
2fddf38da1
correct replacement of align 2019-03-19 12:55:33 +01:00
Laurent Destailleur
9a3c66b057
Merge pull request #10846 from grandoc/new_branch_15_03_2019 
New branch 15 03 2019
 2019-03-19 12:13:02 +01:00
Philippe GRAND
c13a1dbc63 translation 2019-03-18 13:45:24 +01:00
Philippe GRAND
0f03b16313 translation 2019-03-18 12:46:32 +01:00
Laurent Destailleur
f3cf3482fa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/projet/element.php
 2019-03-18 10:23:14 +01:00
Laurent Destailleur
34034787af FIX problem with sign of various payment in project preview 2019-03-18 10:16:08 +01:00
Laurent Destailleur
f6285e7daf Fix phpcs 2019-03-16 23:19:34 +01:00
Laurent Destailleur
dabccb7967 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/fourn/facture/paiement.php
 2019-03-16 20:12:53 +01:00
Laurent Destailleur
8adc333823 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-16 19:41:50 +01:00
Maxime Kohlhaas
46b39dd6a9 Fix #9961 : deal with supplier credit note refund like with customers 2019-03-16 18:13:43 +01:00
Maxime Kohlhaas
21e2d36421 Fix #9311 2019-03-16 09:28:47 +01:00
Philippe Grand
8054f61bac
Update fournisseur.product.class.php 
Oops...to much alcohol..
 2019-03-16 09:14:57 +01:00
Laurent Destailleur
c0b6699b25 All methods set_draft() were renamed into setDraft() 2019-03-15 19:01:40 +01:00
Laurent Destailleur
a2d6723ff3 WIP Link files to expense report lines 2019-03-15 15:07:52 +01:00
Philippe GRAND
2463ee47ba update with html5 compliant code 2019-03-15 09:40:52 +01:00
Laurent Destailleur
86c5dc20e3 NEW Can choose the root category to show for TakePOS module 2019-03-15 02:12:40 +01:00
Laurent Destailleur
2713c430df
Merge branch 'develop' into dev_datepricefour 2019-03-14 18:43:09 +01:00
Laurent Destailleur
463c83efec
Update fournisseur.product.class.php 2019-03-14 18:37:03 +01:00
Laurent Destailleur
8f65ee2296
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode 2019-03-14 17:48:44 +01:00
Laurent Destailleur
60db66d2bf
Update fournisseur.product.class.php 2019-03-14 17:41:33 +01:00
Laurent Destailleur
250e0bbaac
Update fournisseur.product.class.php 2019-03-14 17:40:39 +01:00
Laurent Destailleur
dd962fa044
Update fournisseur.product.class.php 2019-03-14 17:39:01 +01:00
Laurent Destailleur
eeafc3c630 Standardize translation of amount 2019-03-13 14:10:36 +01:00
Laurent Destailleur
98ca9bf17a Reduce quantity of string to translates 2019-03-12 19:44:59 +01:00
Joan Louis
17647de4cc Fix extrafields calls from cards for Dolibarr 8 See #10803 2019-03-12 11:24:54 +01:00
Joan Louis
f326c75be7 Update call to extrafields from cards 2019-03-11 21:34:16 +01:00
Joan Louis
ee5753819e Update call to extrafields from cards 2019-03-11 14:22:04 +01:00
Laurent Destailleur
233bd4374a Fix phpcs 2019-03-08 19:52:26 +01:00
Frédéric FRANCE
d96cc53f97
replace html by html5 in fourn 2019-03-07 20:46:38 +01:00
Laurent Destailleur
ddc52b7199 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/exports/export.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2019-03-07 14:13:38 +01:00
Laurent Destailleur
0729a3b571 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-07 14:11:12 +01:00
Laurent Destailleur
9a9fd15077 Fix doxygen 2019-03-07 14:10:33 +01:00
Laurent Destailleur
02b8bc94e7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-07 14:06:31 +01:00
Laurent Destailleur
d2f1d0cc33 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2019-03-07 14:06:11 +01:00
Laurent Destailleur
e3fb228a4d
Update fournisseur.facture.class.php 2019-03-07 12:28:19 +01:00
gauthier
0ff2905180 FIX : we need to keep originline special_code 2019-03-06 12:10:24 +01:00
Frédéric FRANCE
f283782445
change visibility 2019-03-04 19:57:46 +01:00
Laurent Destailleur
8fce6e5e31 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/core/modules/mailings/xinputfile.modules.php
	htdocs/fourn/facture/card.php
 2019-03-02 19:13:37 +01:00
Laurent Destailleur
40e923ec85 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/modules/modAgenda.class.php
 2019-03-02 19:07:14 +01:00
Laurent Destailleur
4f9981063f Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing 2019-03-02 18:26:50 +01:00
Laurent Destailleur
56d921ea52 CSS 2019-03-02 12:57:07 +01:00
Frédéric FRANCE
014f69850e
add visibility 2019-03-01 23:08:57 +01:00
Frédéric FRANCE
0022c4fe72
add visibility 2019-02-28 22:44:12 +01:00
Laurent Destailleur
a8f447498b Fix applying of credit note on invoice 2019-02-28 19:30:44 +01:00
Laurent Destailleur
dddf322264 Fix bad position of parameters when creating supplier credit note 2019-02-28 19:06:51 +01:00
gauthier
786c114026 FIX : project_title for display of getNomUrl() 2019-02-28 16:13:45 +01:00
atm-quentin
72dc25552a FIX better placement 2019-02-27 09:23:31 +01:00
atm-quentin
cb3a4ac94c missing 1st char 2019-02-27 09:23:23 +01:00
atm-quentin
95593bfaad fix scan barcode only one time instead of 2 (when it was focus we need to open and then write) 2019-02-27 09:23:06 +01:00
atm-quentin
f1055d0e5c make select2 focus to earn time during scanning 2019-02-27 09:22:57 +01:00
atm-quentin
394659f84a missing doc 2019-02-27 09:22:47 +01:00
atm-quentin
f51b89def3 NEW supplier buyprice barcode 2019-02-27 09:22:34 +01:00
Frédéric FRANCE
5a4ac82880
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 08:23:29 +01:00
Laurent Destailleur
014c199173 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/extrafields_list_print_fields.tpl.php
 2019-02-27 01:28:12 +01:00
Laurent Destailleur
6f0d5fcf3f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/variants/combinations.php
 2019-02-27 01:25:25 +01:00
Frédéric FRANCE
81f2f99db5
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-26 21:16:01 +01:00
Frédéric FRANCE
e6c3eb0ba1
wip 2019-02-26 21:13:07 +01:00
Laurent Destailleur
3ec2338c2d Look and feel v10 2019-02-26 19:37:32 +01:00
Laurent Destailleur
6b46a927f1
Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket 2019-02-24 20:53:54 +01:00
Laurent Destailleur
6fdd0191f4
Merge pull request #10676 from frederic34/patch-5 
fix #10656
 2019-02-24 20:45:13 +01:00
Laurent Destailleur
7b2f4771f0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-24 20:30:21 +01:00
Laurent Destailleur
5e6797f39d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-24 20:28:18 +01:00
Laurent Destailleur
2f300ae63f Standardize code with customer invoices 2019-02-24 20:26:54 +01:00
Laurent Destailleur
f41d504ba1
Merge pull request #10518 from atm-greg/8.0_FIX_bad_values_in_fourn_credit_note 
FIX positive values IN supplier credit notes creating diff on addline rounding
 2019-02-24 20:21:22 +01:00
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket 2019-02-24 20:06:55 +01:00
Frédéric FRANCE
ca2eba866c
Update list.php 2019-02-24 11:56:17 +01:00
Frédéric FRANCE
435b416f93
fix #10656 2019-02-24 11:50:06 +01:00
Laurent Destailleur
cdf85b0d00 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-23 16:02:35 +01:00
Laurent Destailleur
0081d3c25d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-23 16:02:10 +01:00
Francis Appels
c38b0c4dbe FIX fk_default_warehouse missing in group by 2019-02-22 12:17:34 +01:00
Laurent Destailleur
ec5461a4d1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/multicurrency/class/multicurrency.class.php
 2019-02-21 22:31:27 +01:00
Laurent Destailleur
6cdf5c5673 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-21 22:28:25 +01:00
atm-quentin
b6deda1111 FIX credit note used on list 2019-02-18 12:28:18 +01:00
gauthier
70f1a9d13d FIX : we want to be able to reopen fourn credit note 2019-02-15 11:41:02 +01:00
Frédéric FRANCE
b6d665a91c
Update card.php 2019-02-14 20:38:21 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing 2019-02-09 12:00:49 +01:00
Laurent Destailleur
8760b1e592 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-08 12:57:50 +01:00
Laurent Destailleur
512ceae70a Fix phpcs 2019-02-08 11:27:30 +01:00
Laurent Destailleur
38d4284638 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/db/pgsql.class.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/filefunc.inc.php
	htdocs/imports/import.php
	htdocs/supplier_proposal/card.php
 2019-02-08 11:26:08 +01:00
Laurent Destailleur
fe1188c4ea Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/filefunc.inc.php
 2019-02-08 10:44:45 +01:00
atm-greg
4624f1b1b8 FIX positive values creating diff on addline rounding 2019-02-06 17:19:16 +01:00
atm-quentin
da0c863f45 FIX supplier invoice payment total dont care about deposit or credit 2019-02-05 10:30:38 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Laurent Destailleur
af9e2d07d2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/paiement.php
	htdocs/fourn/facture/paiement.php
 2019-02-03 20:38:47 +01:00
Laurent Destailleur
4b77b3ff23 NEW Support tag {ccc} on payment ref 2019-02-03 20:36:20 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
03701fa091
psr2 2019-02-02 18:25:01 +01:00
Frédéric FRANCE
96de1b175c
clean missing spaces in the last merge 2019-02-02 08:51:30 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
Laurent Destailleur
3fc49a9de2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-01 16:07:27 +01:00
Laurent Destailleur
6de732d7f8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/facture/mod_facture_mars.php
	htdocs/core/modules/facture/mod_facture_terre.php
 2019-02-01 16:07:18 +01:00
Laurent Destailleur
35f65a571c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/modules/facture/mod_facture_mars.php
	htdocs/core/modules/facture/mod_facture_terre.php
	htdocs/fourn/commande/list.php
 2019-02-01 16:05:43 +01:00
Laurent Destailleur
e366ab551c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-01 16:01:26 +01:00
Laurent Destailleur
dee2a373c1 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2019-02-01 16:01:18 +01:00
Laurent Destailleur
452dfafd32 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2019-02-01 15:56:47 +01:00
Francis Appels
cf9d87df4a Fix travis 2019-02-01 15:40:56 +01:00
Francis Appels
c4915c679a Merge develop 2019-02-01 11:47:03 +01:00
Francis Appels
2c5623c53e check if price already logged, if not first log current price 2019-02-01 11:37:46 +01:00
florian HENRY
f7bed44441 FIX : quick search for supplier orders 2019-01-31 21:39:02 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
408609e0ec Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2019-01-30 16:54:38 +01:00
Laurent Destailleur
9fdba921b4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
 2019-01-30 16:48:33 +01:00
Laurent Destailleur
81ae4c52c5
Merge pull request #10446 from mapiolca/8.0 
Fix #10317 et #10318
 2019-01-30 16:43:14 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines 
PSR2.Files.EndFileNewline.TooMany
 2019-01-30 16:17:09 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Laurent Destailleur
17c3337c9b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-30 15:25:43 +01:00
Regis Houssin
39b696af02 FIX multicompany compatibility 2019-01-29 12:01:40 +01:00
Pierre Ardoin
f9b8622545
Prise en charge de Multicompany 
Correction pour éviter que les factures appartenant à d'autres entités n'apparaissent dans celle qui est consultée sur le moment.
 2019-01-29 11:33:22 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
John BOTELLA
9a666b265f Use an other test 2019-01-28 11:53:19 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Laurent Destailleur
d4daa6cebd
Merge pull request #10430 from frederic34/patch-18 
typo in fournisseur.product.class.php
 2019-01-27 17:51:49 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
0e3efadf59
typo in fournisseur.product.class.php 2019-01-27 14:37:37 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
4a5d260db5
Update fournisseur.product.class.php 2019-01-26 14:07:37 +01:00
John BOTELLA
15e1d3b456 Fix fetch test 2019-01-24 09:40:58 +01:00
Francis Appels
1d08ccef07 Fix sql error 2019-01-22 16:39:54 +01:00
Francis Appels
7ad48064be Add code to show in fourn price tooltip. 2019-01-22 16:18:25 +01:00
Francis Appels
946c017937 Fix and clean price log. Key should price id iso product id. 2019-01-22 15:59:47 +01:00
Laurent Destailleur
d38ed67a3c
Merge pull request #10383 from grandoc/new_branch_21_01_2019 
update with html5 compliant code
 2019-01-21 18:05:40 +01:00
Laurent Destailleur
42743027d4
Merge branch 'develop' into objectline_etc 2019-01-21 18:04:48 +01:00
Philippe GRAND
cdacfc5f37 update with html5 compliant code 2019-01-21 09:54:59 +01:00
torvista
07b2bb6715 Swap of align/valign/border/width for css 
Removal of type="text/javascript"
 2019-01-20 23:36:39 +01:00
Laurent Destailleur
844643c37d
Merge pull request #10375 from grandoc/new_branch_19_01_2019 
update with html5 compliant code
 2019-01-20 19:48:32 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime 
Fix
 2019-01-19 13:22:38 +01:00
Philippe GRAND
549bbb06fc update with html5 compliant code 2019-01-19 12:50:06 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Laurent Destailleur
58bda12e22 css 2019-01-17 19:31:01 +01:00
Laurent Destailleur
5130019003 css 2019-01-17 19:27:26 +01:00
Laurent Destailleur
d5426730cb
Merge pull request #10318 from mapiolca/patch-6 
FIX Multicompany
 2019-01-10 14:01:19 +01:00
Laurent Destailleur
b4a6311f64 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-10 01:48:04 +01:00
Laurent Destailleur
057b606663 Fix tooltip 2019-01-09 15:03:44 +01:00
Laurent Destailleur
fbd490da15 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-09 13:29:47 +01:00
Laurent Destailleur
d1e062cafa FIX When changing date of payment, change also record in bank if not 
conciliated yet.
 2019-01-09 13:28:12 +01:00
Laurent Destailleur
d9999d61f6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-09 12:27:25 +01:00
Laurent Destailleur
890abd28d5 Fix look and feel v9 2019-01-09 12:26:49 +01:00
Laurent Destailleur
09fd3fce83 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-09 11:41:43 +01:00
Laurent Destailleur
61e9e8d60c Fix missing link 2019-01-09 11:41:23 +01:00
mapiolca
caace3730d
Prise en charge de Multicompany 
Evite que les factures appartenant à d'autres entités n'apparaissent dans celle qui est consultée sur le moment.
 2019-01-08 22:34:21 +01:00
ldestailleur
bc00fb177a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
ldestailleur
3af418349a FIX Can't empty the payment mode 2018-12-29 07:54:30 +01:00
Laurent Destailleur
3d30d8513f Fix phpcs 2018-12-16 20:36:22 +01:00
Laurent Destailleur
f55db6dd84 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/resources/dbmodel/dolibarr_schema.mwb
 2018-12-15 14:09:16 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
699dc239d4 Fix US trans 2018-12-15 12:24:14 +01:00
Laurent Destailleur
b511a056f4 Fix phpcs 2018-12-15 11:48:21 +01:00
Laurent Destailleur
baf9b6f309 Fix regression (bad name of function) 2018-12-14 19:21:19 +01:00
Laurent Destailleur
4b90f88793
Merge pull request #10158 from defrance/patch-135 
Refactoring list with dol_sql_datefilter function (end)
 2018-12-14 19:06:54 +01:00
Laurent Destailleur
3571eaee3d
Merge branch 'develop' into NEW_change_order_concat_desc 2018-12-14 17:44:08 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
83efdee7d3
Merge branch 'develop' into new_mass_generate 2018-12-14 15:44:46 +01:00
Laurent Destailleur
611ccc4a9a
Merge branch 'develop' into fieldlabel 2018-12-14 15:42:01 +01:00
Laurent Destailleur
5dabefe227 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-13 20:49:55 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber 2018-12-13 20:24:12 +01:00
Laurent Destailleur
6ad106d14a
Update fournisseur.facture.class.php 2018-12-13 19:56:22 +01:00
atm-quentin
3da9650003 FIX if qty is 0 2018-12-10 16:06:11 +01:00
Laurent Destailleur
138640fc63 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-12-04 14:58:11 +01:00
Laurent Destailleur
8e333c3feb Standardize code 2018-12-04 14:54:58 +01:00
Laurent Destailleur
d80baaea69 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2018-12-04 14:29:47 +01:00
Ferran Marcet
7247b14bd9 FIX Lines are not inserted correctly if VAT have code 2018-12-03 12:28:17 +01:00