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
Ferran Marcet
135a94dfed
Merge branch '7.0up' into 7.0
2018-12-03 11:59:46 +01:00
Ferran Marcet
8312d57d16
FIX Lines are not inserted correctly if VAT have code
2018-12-03 11:58:39 +01:00
Regis Houssin
8953a3ed73
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
Conflicts:
ChangeLog
2018-12-03 08:46:03 +01:00
Maxime Kohlhaas
2e496ea83a
QUAL rename facnumber by ref
2018-12-02 17:33:44 +01:00
BENKE Charlene
ad1ca07085
Update list.php
2018-12-02 09:58:18 +01:00
BENKE Charlene
1bc0defb31
Update list.php
2018-12-02 09:55:26 +01:00
Frédéric FRANCE
9692e98acf
Update fournisseur.facture.class.php
2018-12-01 22:49:12 +01:00
Laurent Destailleur
6d84036f66
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/contact/list.php
htdocs/core/class/html.form.class.php
htdocs/expensereport/card.php
htdocs/install/doctemplates/shipment/template_shipment.odt
htdocs/public/payment/newpayment.php
2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/class/html.formmail.class.php
htdocs/core/modules/modSociete.class.php
htdocs/product/price.php
2018-12-01 18:19:45 +01:00
Maxime Kohlhaas
e8a02a971d
Fix #9074
2018-11-30 23:05:12 +01:00
Laurent Destailleur
ef3a280f40
Merge pull request #10082 from grandoc/new_branch_26_11_2018
...
fix typo error
2018-11-29 10:57:48 +01:00
Laurent Destailleur
0367795488
Fix auto jump on record if only 1 record in a search
2018-11-27 11:09:47 +01:00
Philippe GRAND
05d617b759
fix typo error
2018-11-26 14:33:45 +01:00
Laurent Destailleur
2fcd221dbb
Merge pull request #10048 from frederic34/patch-15
...
Update fournisseur.commande.class.php
2018-11-24 11:20:21 +01:00
Thibault Descamps
c2e5a29246
NEW redirect if only one result on global search on card
2018-11-22 11:36:30 +01:00
Thibault Descamps
1cc130e5f6
NEW : conf to change concat desc order
2018-11-21 09:57:44 +01:00
Laurent Destailleur
be4dc40dfa
Fix standardize date format for payment between customer and supplier
2018-11-20 10:16:54 +01:00
Frédéric FRANCE
2e4ec1ed10
Update fournisseur.commande.class.php
2018-11-19 23:56:20 +01:00
Laurent Destailleur
2f87ee6640
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-19 15:56:38 +01:00
Laurent Destailleur
f85ab8d0a6
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/card.php
2018-11-19 15:55:41 +01:00
Frédéric FRANCE
12dcda7e02
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-11-15 22:01:36 +01:00
Regis Houssin
aaa9a4f47c
FIX use getEntity('invoice') instead getEntity('facture')
2018-11-15 17:27:49 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused
2018-11-13 21:40:17 +01:00
gauthier
85dd0ec2dd
FIX : filter on product category doesn't work
2018-11-13 15:24:53 +01:00
tarrsalah
5eb897e049
FIX sql query performance on list_qualified_avoir_supplier_invoices.
2018-11-12 12:11:40 +01:00
Frédéric FRANCE
09efde4901
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-11-09 18:13:59 +01:00
Regis Houssin
89389baeac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
2018-11-09 15:37:29 +01:00
Laurent Destailleur
f1193ad3dd
FIX: Missing date creation and modification of supplier price
2018-11-09 10:29:22 +01:00
Laurent Destailleur
66ffcf287a
Fix filter on extrafields
2018-11-07 12:49:17 +01:00
Laurent Destailleur
4a25317f10
Fix security on GETPOST('action'). Param must be sanitized.
2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e
FIX sanitize param $action
2018-11-05 17:53:31 +01:00
Frédéric FRANCE
da3ee9ad9a
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-10-30 19:04:35 +01:00
Regis Houssin
9589f69574
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_email
Conflicts:
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
2018-10-30 18:29:28 +01:00
Laurent Destailleur
2c3cd7a668
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modSyslog.class.php
2018-10-30 15:32:09 +01:00
Laurent Destailleur
4dca94480e
Merge pull request #9892 from atm-maxime/fix_supp_inv_clone
...
Fix invoice supplier clone was not getting all lines parameters #9800
2018-10-30 14:59:48 +01:00
Laurent Destailleur
cb2a5baa45
Merge pull request #9919 from atm-john/Fix_clone_fourn_invoice
...
Fix clone fourn order and invoice lines special code
2018-10-30 14:55:50 +01:00
Laurent Destailleur
4a71374cf7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-30 14:48:09 +01:00
Laurent Destailleur
68f6ebd0ff
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/lib/security.lib.php
htdocs/modulebuilder/template/myobject_card.php
2018-10-30 14:47:39 +01:00
Laurent Destailleur
76c3bac777
Merge pull request #9900 from frederic34/patch-21
...
use strict compare
2018-10-30 14:23:14 +01:00
Laurent Destailleur
a16e7a84e9
Merge pull request #9899 from frederic34/patch-20
...
use strict compare
2018-10-30 14:23:01 +01:00
John BOTELLA
1e819ca7c1
FIX special code on create supplier invoice from supplier order
2018-10-30 10:46:33 +01:00
John BOTELLA
ca47d1b8b1
Fix clone fourn order and invoice lines special code
2018-10-30 10:26:59 +01:00
Laurent Destailleur
8fbf5b1f33
FIX deletion on draft is allowed if we are allwoed to create
2018-10-29 18:28:19 +01:00
Laurent Destailleur
0266db7aa8
FIX deletion on draft is allowed if we are allwoed to create
2018-10-29 18:19:40 +01:00
Laurent Destailleur
d02fccd7e4
Fix deletion of draft invoice
2018-10-29 14:56:00 +01:00
Laurent Destailleur
824757bca6
Fix perm to delete
2018-10-29 14:47:33 +01:00
Laurent Destailleur
27d82d0e8e
FIX Delete of draft invoice
2018-10-29 14:41:00 +01:00
Frédéric FRANCE
d7507ac858
use strict compare
2018-10-27 21:00:59 +02:00
Frédéric FRANCE
84219039a2
use strict compare
2018-10-27 20:57:59 +02:00
Frédéric FRANCE
e1625990f2
use strict compare
2018-10-27 20:54:53 +02:00
Frédéric FRANCE
fe5056add8
remove fieldlabel and add fieldeditkey
2018-10-27 18:07:05 +02:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Maxime Kohlhaas
4ec80b5136
Fix invoice supplier clone was not getting all lines parameters #9800
2018-10-27 10:53:01 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
2018-10-24 23:04:26 +02:00
John BOTELLA
a380d3e89b
Fix missing group by in query
2018-10-24 09:21:30 +02:00
atm-john
bed5084bcf
Add missing Max payment date col
2018-10-23 21:44:45 +02:00
atm-quentin
04eb9ca167
fix dont change num version
2018-10-23 17:06:21 +02:00
atm-quentin
96d0bb8f2e
FIX adapt develop
2018-10-23 14:31:58 +02:00
atm-quentin
8442b405b2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception
2018-10-23 10:27:46 +02:00
atm-quentin
cfff4c7df8
NEW add ref supplier on supplier invoice
2018-10-22 14:32:50 +02:00
atm-quentin
eeb75bf650
FIX add object linked supplier order of reception
2018-10-18 10:26:32 +02:00
atm-quentin
dd0a57d39e
FIX pdf for creating invoice without massaction
2018-10-17 15:36:47 +02:00
atm-quentin
236a61ab55
new manage correctly create bills on reception
2018-10-17 11:56:32 +02:00
atm-quentin
f11e1940fc
NEW mass action list reception create bills for validated reception
2018-10-16 12:05:28 +02:00
atm-quentin
83c8a78628
NEW auto event msg
2018-10-15 17:08:28 +02:00
Maxime Kohlhaas
d4d921b1cc
Add massaction generate on main lists
2018-10-14 16:27:59 +02:00
atm-quentin
3e29b11890
NEW add field list if reception
2018-10-11 17:30:14 +02:00
atm-quentin
aaace60b0d
FIX stock movement on close reception and set status if too much receive$
2018-10-10 15:33:35 +02:00
Philippe GRAND
9b6367c1ee
Standardize and update code
2018-10-10 12:16:20 +02:00
atm-quentin
7ad4a7e384
NEW creation facture fourn depuis reception
2018-10-09 16:26:40 +02:00
Philippe GRAND
bba6669f03
Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018
2018-10-09 08:47:26 +02:00
atm-quentin
c6ab79bad3
NEW note, contact and lines on card
2018-10-08 16:54:33 +02:00
Laurent Destailleur
59a082d251
FIX Show the date of invoice on supplier payment
2018-10-06 21:33:43 +02:00
atm-quentin
6a8092dfae
NEW entete reception card
2018-10-05 16:21:50 +02:00
Philippe GRAND
073ec85208
Standardize code
2018-10-05 15:51:08 +02:00
Philippe GRAND
c7c3780400
clean code
2018-10-05 15:34:32 +02:00
atm-quentin
752c35d6d1
addline presque fini
2018-10-04 17:32:50 +02:00
Laurent Destailleur
ba3552558c
Merge pull request #9662 from frederic34/patch-17
...
remove useless param
2018-10-04 17:26:21 +02:00
Laurent Destailleur
9f2a2be837
Merge pull request #9661 from frederic34/patch-16
...
remove useless phpcs:disable
2018-10-04 17:25:44 +02:00
atm-quentin
5fe767d7bd
debut card create
2018-10-04 12:27:10 +02:00
atm-quentin
bc07936d42
NEW list on dispatch
2018-10-04 10:17:18 +02:00
atm-quentin
52717dbb65
NEW debut rename stock conf
2018-10-03 18:05:22 +02:00
Frédéric FRANCE
1735229f15
remove useless param
...
/**
* Return label of a status
*
* @param int $statut Id statut
* @param int $mode 0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
* @param int $billed 1=Billed
* @return string Label of status
*/
function LibStatut($statut,$mode=0,$billed=0)
{
2018-10-02 20:47:40 +02:00
Frédéric FRANCE
dae2757b73
remove useless phpcs:disable
2018-10-02 20:39:44 +02:00
Alexey Pyltsyn
49de7a5881
Replace multiple load calls with loadLangs method
2018-10-01 09:22:23 +03:00
Philippe GRAND
574cfad48f
Standardize and update code
2018-09-28 14:49:34 +02:00
Laurent Destailleur
d72446cebc
Merge pull request #9528 from grandoc/new_branch_16_09_2018
...
New branch 16 09 2018
2018-09-18 15:01:23 +02:00
Laurent Destailleur
ab0f842db6
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-16 12:55:44 +02:00
Laurent Destailleur
74a9c680df
FIX "Other ..." link so the "Back to" link works.
2018-09-16 12:27:56 +02:00
Philippe GRAND
9f35767b4b
Standardize and update code
2018-09-16 11:53:49 +02:00
Philippe GRAND
251273e3c3
Standardize and update code
2018-09-16 11:50:29 +02:00
Philippe GRAND
cd8e0aa919
Standardize and update code
2018-09-16 11:47:56 +02:00
Philippe GRAND
120f823065
Standardize and update code
2018-09-16 11:45:18 +02:00
Philippe GRAND
988774120c
Standardize and update code
2018-09-16 11:42:20 +02:00
Philippe GRAND
ab92871dc3
Standardize and update code
2018-09-16 11:37:43 +02:00
Laurent Destailleur
d6ee00f2e7
Fix constructors does not need return value
2018-09-16 10:22:23 +02:00
Frédéric FRANCE
fafa7f18b1
reduce complexity libstatut fournisseur.commande;class.php
2018-09-15 22:24:57 +02:00
gauthier
7838b75ec9
FIX : wrong var name
2018-09-13 16:11:42 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 21:29:41 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6
2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-12 18:32:15 +02:00
Laurent Destailleur
fcabe67e4b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-12 13:30:28 +02:00
Frédéric FRANCE
8249756726
replace select_date
2018-09-09 10:40:00 +02:00
Frédéric FRANCE
b2a58067d9
replace select_date
2018-09-09 09:56:33 +02:00
Laurent Destailleur
bcfb5fc42e
Merge pull request #9425 from atm-maxime/8.0
...
FIX : Homepage links were using wrong topmenus
2018-09-07 19:35:10 +02:00
Laurent Destailleur
ff05997f0a
FIX Several fixes on the management of minimal amount for orders
2018-09-06 17:37:02 +02:00
Maxime Kohlhaas
a5f4a74ecc
FIX : Homepage links were using wrong topmenus
2018-09-06 14:49:48 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2
2018-09-04 20:48:35 +02:00
Frédéric FRANCE
fd6281b364
move phpcs:ignore
2018-09-04 20:00:09 +02:00
Frédéric FRANCE
5f4a922c1d
move phpcs:ignore
2018-09-03 19:00:37 +02:00
Frédéric FRANCE
2a9ef8dc05
move phpcs:ignore
2018-09-02 22:05:19 +02:00
Frédéric FRANCE
35232b753a
move phpcs:ignore
2018-09-02 20:37:12 +02:00
Philippe GRAND
3de16a145e
Standardize and update code
2018-09-02 11:08:41 +02:00
Philippe GRAND
db32d8903e
Standardize and Update code
2018-09-01 23:20:20 +02:00
Philippe GRAND
7b0d3c32ab
Standardize and Update code
2018-09-01 22:55:10 +02:00
Philippe GRAND
5d273960dc
fix conflict
2018-09-01 22:40:38 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps
...
mark non camelCaps function
2018-09-01 15:37:56 +02:00
Philippe GRAND
45cbc36a15
Standardize and update code
2018-09-01 15:27:55 +02:00
Philippe GRAND
17e349eba2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2018-09-01 14:27:53 +02:00
Laurent Destailleur
bcee0ef0ae
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/societe/class/societe.class.php
htdocs/stripe/config.php
2018-09-01 14:16:57 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-09-01 13:52:51 +02:00
Philippe GRAND
1944ef0dc3
conflict resolution
2018-09-01 12:38:22 +02:00
Laurent Destailleur
482ddd548a
Merge pull request #9332 from frederic34/functionClosingBrace
...
PSR2 FunctionClosingBrace
2018-09-01 12:06:08 +02:00
Philippe GRAND
bb05e80a87
Standardize and update code
2018-08-31 18:47:25 +02:00
Philippe GRAND
9e880d3e72
Standardize and update code
2018-08-31 17:55:31 +02:00
Laurent Destailleur
9cc6533d11
Fix td alignement
2018-08-30 18:57:30 +02:00
Frédéric FRANCE
5100b8b7b0
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-30 10:42:47 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration
2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace
2018-08-29 21:25:22 +02:00
Laurent Destailleur
7211aff016
Update dispatch.php
2018-08-29 21:11:28 +02:00
Laurent Destailleur
a8bb55c66d
Merge branch '8.0' into 7.0_new_dispatch
2018-08-29 21:08:51 +02:00
Laurent Destailleur
88044a3d75
Update dispatch.php
2018-08-29 20:42:19 +02:00
Laurent Destailleur
489e766cbf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/ticket/class/ticket.class.php
2018-08-29 20:24:01 +02:00
Laurent Destailleur
3ebfb23407
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/fournisseurs.php
htdocs/ticket/class/ticket.class.php
2018-08-29 20:22:50 +02:00
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-29 18:45:36 +02:00
Laurent Destailleur
86d8513138
Merge pull request #9309 from frederic34/trimtrailing2
...
last trimtrailing
2018-08-29 17:57:05 +02:00
Laurent Destailleur
7bf48b8d77
Fix date_start and date_end not saved on supplier invoice
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
2018-08-29 17:26:41 +02:00
Laurent Destailleur
98356c6ed0
Fix date_start and date_end not saved on supplier invoice
2018-08-29 17:03:18 +02:00
Frédéric FRANCE
0e512cbc36
Merge remote-tracking branch 'upstream/develop' into trimtrailing2
2018-08-29 15:47:55 +02:00
Laurent Destailleur
ee204e2e64
Fix regression in php style
2018-08-29 15:37:35 +02:00
atm-quentin
76cb9f60c7
NEW hook on dispatch order fourn
2018-08-29 14:26:04 +02:00
Laurent Destailleur
b5c2383f65
Fix type of invoice encoded twice
2018-08-28 18:34:53 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-28 09:34:53 +02:00
Frédéric FRANCE
1182f29864
trimtrailing
2018-08-28 08:33:02 +02:00
Laurent Destailleur
50d50c2e10
Merge pull request #9307 from ATM-Marc/FIX_6.0_thirdparty_info
...
NEW On customer/supplier card, add simple tooltip to amount boxes
2018-08-28 02:48:05 +02:00
Laurent Destailleur
9a14611d55
Merge pull request #8996 from grandoc/new_branch_20_06_2018
...
clean and update code
2018-08-28 02:35:59 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing
...
Trimtrailing
2018-08-28 02:30:02 +02:00
Marc de Lima Lucio
d09f9b2543
FIX: customer/supplier card: add simple tooltip to amount boxes
2018-08-27 18:19:42 +02:00
Philippe GRAND
87067b2bc9
Standardize and update code
2018-08-23 18:35:45 +02:00
Philippe GRAND
74ce0bfea6
Standardize and update code
2018-08-23 16:54:24 +02:00
Philippe GRAND
80b7229174
Standardize and update code
2018-08-23 11:34:55 +02:00
Philippe GRAND
9e900e583d
Merge branch 'new_branch_21_08_2018' of github.com:grandoc/dolibarr into new_branch_21_08_2018
2018-08-23 11:13:54 +02:00
Philippe GRAND
aafa16afa5
Update and standardize code
2018-08-23 11:11:46 +02:00
Philippe Grand
f98d2078e2
Merge branch 'develop' into new_branch_20_06_2018
2018-08-23 10:41:34 +02:00
Philippe Grand
b817517997
Update fournisseur.product.class.php
2018-08-23 10:08:17 +02:00
Philippe Grand
0e3c9ffd51
Update fournisseur.facture.class.php
2018-08-23 10:05:02 +02:00
Philippe GRAND
0c75c41e7b
Update and standardize code
2018-08-22 19:56:24 +02:00
Philippe GRAND
06da7f54a2
Update and standardize code
2018-08-22 18:48:53 +02:00
Philippe GRAND
0ffad50974
Update and standardize code
2018-08-22 11:24:31 +02:00
Philippe GRAND
a36061079b
Update and standardize code
2018-08-22 11:11:59 +02:00
Philippe GRAND
a669830427
Update and standardize code
2018-08-22 10:37:16 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-21 20:57:58 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-21 14:03:02 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-16 08:17:55 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration
2018-08-16 00:52:55 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing
2018-08-16 00:47:09 +02:00
Frédéric FRANCE
69a7af88e7
function declaration
2018-08-15 18:14:02 +02:00
Laurent Destailleur
ec56ad752c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-08-15 14:26:38 +02:00
Frédéric FRANCE
c0478cb42f
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-14 15:54:40 +02:00
Frédéric FRANCE
d30874750f
Merge remote-tracking branch 'upstream/develop' into camelCaps
2018-08-14 09:02:12 +02:00
Laurent Destailleur
b98ee516d0
Merge pull request #9235 from grandoc/new_branch_13_08_2018
...
standardize code
2018-08-13 23:47:00 +02:00
Laurent Destailleur
b4a4ab4fa0
Merge pull request #9233 from grandoc/new_branch_12_08_2018
...
standardize code
2018-08-13 23:46:37 +02:00
delcroix Patrick
3b9266060c
Fix #9205 quote in Label/number on supplier payment
...
# Fix #9205 #9205
the num_paiement wasn't escaped, not sure it's an real issue but it was reported here
https://www.dolibarr.fr/forum/8-mise-a-jour/62340-message-erreur-suite-mise-a-jour#99408
2018-08-13 23:42:18 +02:00
delcroix Patrick
cbdd1949df
Fix #9205 quote in Label/number on supplier payment
...
# Fix #9205 #9205
the num_paiement wasn't escaped, not sure it's an real issue but it was reported here
https://www.dolibarr.fr/forum/8-mise-a-jour/62340-message-erreur-suite-mise-a-jour#99408
2018-08-13 20:39:20 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function
2018-08-13 17:26:32 +02:00
Laurent Destailleur
b977c3a9f5
Fix translation
2018-08-13 14:04:10 +02:00
Philippe GRAND
f1f64db4dc
standardize code
2018-08-13 10:20:21 +02:00
Philippe GRAND
dc3a2ac26e
standardize code
2018-08-12 22:40:47 +02:00
Frédéric FRANCE
82e8efe792
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 20:14:14 +02:00
Laurent Destailleur
9fc5d39d07
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-08-12 20:09:22 +02:00
Laurent Destailleur
0a1c6e7194
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/list.php
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-08-12 20:08:20 +02:00
Frédéric FRANCE
62db9a4022
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 19:54:03 +02:00
Laurent Destailleur
2d571acc03
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/commande/list.php
2018-08-12 19:25:44 +02:00
Laurent Destailleur
30b4d88428
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/product/reassort.php
htdocs/societe/list.php
2018-08-12 19:23:45 +02:00
Laurent Destailleur
1b20d6feab
Merge pull request #9214 from atm-greg/Add_supplier_product_description
...
NEW Can record the supplier product description
2018-08-12 18:56:27 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-12 18:21:59 +02:00
Frédéric FRANCE
79aaddbb66
test phpcs v3
2018-08-09 14:46:00 +02:00
Laurent Destailleur
61d7629ab1
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
2018-08-08 17:44:22 +02:00
Laurent Destailleur
8d54df4263
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
2018-08-08 17:31:23 +02:00
Frédéric FRANCE
5f4d54ede5
correct space
2018-08-07 17:17:58 +02:00
Frédéric FRANCE
9025c452ef
Merge remote-tracking branch 'upstream/develop' into trimtrailing
2018-08-07 16:40:03 +02:00
atm-greg
ad5f59822e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
2018-08-07 09:33:30 +02:00
atm-greg
fc705e8510
Merge branch '8.0' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
2018-08-07 09:31:41 +02:00
atm-greg
c1de7fe8ac
fix update_buyprice
2018-08-07 09:15:30 +02:00
atm-greg
a8b33a1710
New fields desc_supplier on product_fourn_prices
2018-08-06 16:26:25 +02:00
Philippe GRAND
948647f3f9
comment translation
2018-08-04 14:17:51 +02:00
Laurent Destailleur
e85ec19018
Merge pull request #9093 from atm-gauthier/FIX_filters
...
FIX : page must always be 0 when we search
2018-08-02 17:48:35 +02:00
Juanjo Menent
37a9a2df56
Merge pull request #9167 from frederic34/include
...
Include and co are statements
2018-08-02 11:03:44 +02:00
tarrsalah
8278a9fa52
FIX filter supplier invoice list by societe name.
2018-07-29 13:18:05 +01:00
Frédéric FRANCE
8312d95174
trim trailing
2018-07-26 18:22:16 +02:00
Frédéric FRANCE
a0a5d33641
test include
2018-07-26 17:30:53 +02:00
Philippe GRAND
ff04cb64c0
Clean and update code
2018-07-25 15:36:50 +02:00
Frédéric FRANCE
bde30b85ad
use defaut currency for supplier order
2018-07-24 17:06:12 +02:00
gauthier
80ff7fa86f
FIX : case when we valid form with keyboard
2018-07-11 15:18:30 +02:00
gauthier
103c7e6d06
FIX : page must always be 0 when we search (to avoid case : when we're on page 3 and we're looking for a precise thirdparty, we stay on page 3 and nothing's displaied)
2018-07-11 09:51:36 +02:00
Laurent Destailleur
5f52dfa873
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-07-10 14:02:40 +02:00
Regis Houssin
e8afd7e833
Fix: use "supplier" instead "reseller"
2018-07-07 08:48:26 +02:00
Regis Houssin
1522a5b22d
Fix: differentiate customer prices from supplier prices sharing
2018-07-07 08:43:59 +02:00
Laurent Destailleur
eb71810bdc
Merge pull request #8999 from dolibarr95/patch-46
...
NEW Add supplier ref in item reception page
2018-06-29 19:18:20 +02:00
Laurent Destailleur
569291763f
Update dispatch.php
2018-06-29 19:17:44 +02:00
Laurent Destailleur
da138db528
FIX combo into popup become crazy with IE10
...
Conflicts:
htdocs/asset/card.php
htdocs/modulebuilder/template/myobject_card.php
2018-06-28 12:16:12 +02:00
Laurent Destailleur
ed2ec78332
FIX combo of stock in popup are crazy in IE
2018-06-28 12:11:00 +02:00
Laurent Destailleur
3ea2d81279
FIX combo into popup become crazy with IE10
2018-06-28 12:05:02 +02:00
Laurent Destailleur
55d5d01cfe
FIX combo of stock in popup are crazy in IE
2018-06-28 11:53:52 +02:00
Philippe GRAND
1bb91c7860
update and clean code
2018-06-24 16:20:27 +02:00
Laurent Destailleur
af9d2c3b5a
Merge pull request #9008 from grandoc/new_branch_22_06_2018
...
clean and update code
2018-06-24 13:47:26 +02:00
Laurent Destailleur
0170906524
Look and feel
2018-06-23 14:39:24 +02:00
Laurent Destailleur
27a27e02a1
Fix css
2018-06-22 22:53:53 +02:00
Philippe GRAND
afda5288a8
clean and update code
2018-06-22 16:27:11 +02:00
Laurent Destailleur
07c514b85c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.product.class.php
htdocs/projet/class/projectstats.class.php
2018-06-20 21:56:10 +02:00
Laurent Destailleur
9f2437fa04
Fix missing field
2018-06-20 17:59:01 +02:00
dolibarr95
3b33dad8fd
Add supplier ref
...
Hi
In all common case the supplier send a receipt with the parcel on which is writen his product ref (because this is his reference) with the quantity in the parcel and if he is smart/nice our reference.
By adding the supplier ref column the supplier order dispatch is easier.
Tks.
2018-06-20 14:40:32 +02:00
Philippe GRAND
4f554ab52a
clean and update code
2018-06-20 12:09:47 +02:00
Laurent Destailleur
9d048281dc
Merge pull request #8970 from inoveaconseil/FixParamGenerateDocument
...
Fix missing params on generateDocument
2018-06-18 11:14:49 +02:00
Laurent Destailleur
187127ce6f
Fix CSS
2018-06-16 21:19:50 +02:00
Laurent Destailleur
8c748505db
Use parent instead of parents
2018-06-16 17:25:16 +02:00
Laurent Destailleur
7ad086bbdf
FIX Duplicate select2 when we split a supplier order receipt item
2018-06-16 17:18:17 +02:00
Laurent Destailleur
5524784421
FIX prefilled date of order must have hours too
2018-06-16 15:24:31 +02:00
Laurent Destailleur
7981bd08b7
Fix price+sql error when adding product when no supplier price defined
2018-06-16 14:47:33 +02:00
Laurent Destailleur
4898f10fa2
FIX Adding a product with no supplier price defined yet
2018-06-16 13:49:28 +02:00
Inovea Conseil
d5a3e63e05
Fix missing paramater for generateDocument
2018-06-15 09:47:28 +02:00
Marc de Lima Lucio
1dec4c4320
FIX: supplier order: product supplier ref not saved on addline
2018-06-14 10:37:40 +02:00
Laurent Destailleur
910652eb6d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/admin.lang
2018-06-13 23:07:30 +02:00
Laurent Destailleur
4c2af6fc70
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/class/html.form.class.php
2018-06-13 23:04:08 +02:00
Laurent Destailleur
4a5fd35e11
Look and feel v8
2018-06-13 22:57:41 +02:00
Laurent Destailleur
fdc90da408
Update card.php
2018-06-13 20:02:38 +02:00
altatof
d42f00bca9
FIX : pu_ht_devise was not converted to numeric so decimals were lost
...
when clculating total_ht_devise
2018-06-13 16:35:52 +02:00
florian HENRY
8031ef49f2
fix error return
2018-06-05 20:38:55 +02:00
Laurent Destailleur
d8d4d15b4b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-30 12:13:40 +02:00
Laurent Destailleur
de59892438
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
2018-05-30 12:13:18 +02:00
Laurent Destailleur
0412264418
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2018-05-30 12:05:54 +02:00
Laurent Destailleur
60321aabd8
Fix regression
2018-05-30 11:59:23 +02:00
Laurent Destailleur
c1f5c6becf
Merge pull request #8877 from frederic34/longlines
...
soft limit length of lines to 500 chars
2018-05-30 11:19:29 +02:00
Laurent Destailleur
3733169120
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/recap-compta.php
htdocs/fourn/class/fournisseur.commande.class.php
2018-05-30 11:09:53 +02:00
Laurent Destailleur
7590df85e6
Merge pull request #8887 from atm-florian/6.0
...
add hook on balence pages
2018-05-30 10:47:59 +02:00
Laurent Destailleur
e57ceab5de
Update fournisseur.commande.class.php
2018-05-30 10:45:06 +02:00
florian HENRY
b65b545e0f
add hook on balence pages
2018-05-29 16:29:14 +02:00
ATM-Nicolas
6b0b975ffd
FIX : Keep supplier proposal price for supplier order
2018-05-29 11:21:30 +02:00
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars
2018-05-27 15:04:12 +02:00
Frédéric FRANCE
9cd7bb3f58
loadlangs
2018-05-26 16:03:19 +02:00
jean
eb39e5746e
Merge remote-tracking branch 'origin/develop' into dev_datepricefour
2018-05-25 15:32:15 +02:00
Laurent Destailleur
f58e0d3bcf
Fix scrutinizer errors
2018-05-23 08:24:20 +02:00
jean
1ab5eece6b
Adding code to show update date of supplier price shown
2018-05-22 09:40:49 +02:00
Laurent Destailleur
dd53f414f8
Merge pull request #8788 from bugness-chl/develop
...
Fix #8722 useless sql ORDER BY
2018-05-18 11:16:08 +02:00
Laurent Destailleur
ef395fc36b
Fix scrutinizer bugs
2018-05-16 15:23:52 +02:00
Chl
9b2f62791b
Fix #8722 useless sql ORDER BY
2018-05-13 15:52:47 +02:00
Laurent Destailleur
9c68b81f59
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/projet/class/task.class.php
2018-05-05 14:34:54 +02:00
atm-greg
942e2f40bf
addline manage rank on its own if not provided
2018-05-02 17:07:27 +02:00
Laurent Destailleur
984ef37ff5
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-29 20:19:05 +02:00
Laurent Destailleur
9a345e99ef
Fix syntax error
2018-04-29 20:14:57 +02:00
Laurent Destailleur
0cdfd6800a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-29 20:11:47 +02:00
Laurent Destailleur
82a8513aed
Standardize code
2018-04-29 19:52:14 +02:00
Laurent Destailleur
a80621471c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
2018-04-27 12:42:18 +02:00
Laurent Destailleur
e5df7e206b
Merge pull request #8224 from atm-ph/fix_6.0_supplier_order_from_supplier_proposal
...
Fix wrong price on supplier order line
2018-04-27 12:20:49 +02:00
Laurent Destailleur
d179cafa9c
Update fournisseur.commande.class.php
2018-04-27 12:19:32 +02:00
Laurent Destailleur
ecd84f6c45
Update fournisseur.commande.class.php
2018-04-27 12:18:45 +02:00
Laurent Destailleur
4c87cbf644
Update card.php
2018-04-27 12:14:51 +02:00
Laurent Destailleur
1cbf5f1c5e
Merge pull request #8687 from dolibarr95/patch-43
...
NEW : Allow negative quantity for dispatch (supplier order)
2018-04-27 11:41:05 +02:00
Laurent Destailleur
0a4bd14bc3
Merge pull request #8678 from defrance/patch-111
...
add $user on delete line
2018-04-27 10:31:19 +02:00
Laurent Destailleur
2ecbd132aa
Merge pull request #8668 from tuxgasy/Add_Hook_ordersupplierdispatch
...
New ordersupplierdispatch hook
2018-04-27 09:47:22 +02:00
Laurent Destailleur
59e5545aa7
Fix phpunit
2018-04-27 09:18:25 +02:00
dolibarr95
1fb6f79727
Update dispatch.php
...
Only without batch module enabled
2018-04-27 09:14:52 +02:00
dolibarr95
14e68ea8f9
Allow qty to be negative
2018-04-26 16:42:08 +02:00
BENKE Charlene
c879232fd7
add $user on delete line
...
possible to hamonize the call function for all line->delete ?
2018-04-24 23:41:12 +02:00
Laurent Destailleur
5eb7c7ffff
FIX Edit of ref_supplier in supplier invoice
2018-04-24 13:22:34 +02:00
Laurent Destailleur
9d070cac87
NEW Can add product in supplier order/invoice even w/o predefined price
...
Add option SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY,
SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY and
SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY to restore restricted old
behaviour.
2018-04-24 12:57:31 +02:00
Laurent Destailleur
461ae46cc4
FIX When on a high page and searching for a small result, list was not
...
visible.
2018-04-24 11:37:57 +02:00
TuxGasy
6d552a2ae6
Add ordersupplierdispatch hook
2018-04-23 15:05:37 +02:00
Laurent Destailleur
e9a2894727
Fix PSR2
2018-04-22 20:59:29 +02:00
Laurent Destailleur
69adf73f4f
Clean code from $var = True
2018-04-22 19:27:37 +02:00
Laurent Destailleur
fec9303d18
Remove useless $var
2018-04-22 18:51:03 +02:00
Laurent Destailleur
06e51703b1
Clean constructors
2018-04-21 16:01:05 +02:00
Laurent Destailleur
912d5c53f2
Standardize code
2018-04-21 15:54:05 +02:00
Laurent Destailleur
411949a6bb
Optimize constructors
2018-04-21 15:08:46 +02:00
Laurent Destailleur
ccd9aa8059
Fight against dolibarr warnings
2018-04-21 12:16:12 +02:00
Laurent Destailleur
cef9782179
Clean defined constant at begin of pages
2018-04-21 12:00:55 +02:00
Laurent Destailleur
bbfc4a3e17
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
2018-04-18 03:26:15 +02:00
Laurent Destailleur
faea6861c3
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/invoicetemplate_list.php
htdocs/langs/en_US/bills.lang
2018-04-16 18:19:21 +02:00
Laurent Destailleur
0d0da234b1
Lowercase NULL, TRUE, FALSE according to PSR2
2018-04-16 13:51:16 +02:00
Laurent Destailleur
0d26bdcdc5
FIX Button receive products not visible
2018-04-16 11:20:29 +02:00
Laurent Destailleur
d549090290
Fix translation of button action must be a verb
2018-04-16 11:12:56 +02:00
Laurent Destailleur
2959dc4a3a
Fix regression
2018-04-15 18:20:04 +02:00
Laurent Destailleur
8fbde88872
Look and feel v8
2018-04-15 17:37:49 +02:00
florian HENRY
ad403c7045
fix syntax and uniformize code
2018-04-14 17:04:38 +02:00
Laurent Destailleur
b4ef3945d2
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/facture/card.php
2018-04-13 23:52:08 +02:00
Laurent Destailleur
6a3c2f9808
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/fourn/facture/card.php
2018-04-13 23:27:14 +02:00
Laurent Destailleur
50a3b73a6f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-04-13 23:21:29 +02:00
Laurent Destailleur
3ec295935c
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-04-13 23:21:18 +02:00
Laurent Destailleur
c25e21de4b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-13 23:19:22 +02:00
Laurent Destailleur
8cfcdabcac
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2018-04-13 23:03:46 +02:00
atm-greg
4fae1e3236
rank of invoice_supplier lines was always -1
2018-04-13 17:01:10 +02:00
atm-greg
8d4126274a
rang was missing on order_supplier lines
2018-04-13 15:53:49 +02:00
Laurent Destailleur
be965bdbab
Clean code
2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b
Clean code
2018-04-13 11:03:03 +02:00
atm-greg
ef2c6a0ed4
fix sql error
2018-04-13 10:31:36 +02:00
atm-greg
58535993c1
use special_code on order_supplier lines
2018-04-13 10:31:27 +02:00
Laurent Destailleur
6e288fca75
Merge pull request #8575 from all3kcis/develop-patch-16
...
NEW Add files management on products lot
2018-04-13 00:57:13 +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
1c9661d9d6
FIX Update incoterm on supplier invoice
2018-04-12 21:39:12 +02:00
All-3kcis
880fa55dd5
display user-friendly filesize
2018-04-12 15:29:22 +02:00
Laurent Destailleur
ea2fd67e0d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/langs/de_DE/admin.lang
2018-04-12 13:31:14 +02:00
Laurent Destailleur
307f217d56
Merge pull request #8543 from ATM-Nicolas/fix_duplicate_events
...
FIX : multiple creation of same event
2018-04-11 16:28:32 +02:00
Laurent Destailleur
1feee6378f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-11 14:45:52 +02:00
ATM-Nicolas
cffe1e9771
FIX : Multiple creation of same event
2018-04-10 17:11:18 +02:00
Maxime Kohlhaas
cb1a011b50
Fix default currency not set on supplier order creation from commercial menu #8459
2018-04-10 14:14:16 +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
99ed9c4589
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/compta/facture/list.php
2018-04-08 13:10:10 +02:00
Laurent Destailleur
79af10fc83
Fix search filters
2018-04-08 13:01:42 +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
Laurent Destailleur
e20585daed
Merge pull request #8505 from OPEN-DSI/fix-supplier-order-get-dispatched-line-id-add-quantity
...
FIX CommandeFournisseur::getDispachedLines line ID & return quantity
2018-04-06 09:17:51 +02:00
Laurent Destailleur
9d9f3ddf85
Merge pull request #8502 from ATM-Marc/NEW_create_from_list
...
NEW: generalize use of button to create new element from list
2018-04-05 16:40: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
43f8834b28
Uniformize code with the new module builder framework
2018-03-31 18:48:27 +02:00
Marc de Lima Lucio
0366e645d5
NEW: generalize button to create object from list, for most of the lists
2018-03-30 16:54:38 +02:00
Laurent Destailleur
b5c53e9d76
Merge pull request #8469 from ATM-Marc/NEW_product_default_warehouse
...
NEW: default warehouse field for products
2018-03-29 13:51:37 +02:00
Marc de Lima Lucio
3646374976
NEW: default warehouse field for products + prefill warehouses when dispatching supplier orders
2018-03-28 11:54:21 +02:00
Alexandre SPANGARO
c012c330de
Merge remote-tracking branch 'uptream/develop' into 8.0-a11
2018-03-27 21:45:35 +02:00
Alexandre SPANGARO
6e27da605a
Add label project in tooltip in customer/supplier list
2018-03-27 21:41:25 +02:00
dolibarr95
5a63771c87
Add date
2018-03-27 15:11:42 +02:00
Laurent Destailleur
852191010a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-03-25 15:29:11 +02:00
Laurent Destailleur
934d2d8881
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/filefunc.inc.php
2018-03-25 15:27:31 +02:00
florian HENRY
46d2b4d62d
fix security check on fourn card
2018-03-22 23:25:54 +01:00
Laurent Destailleur
d4ae0395ed
NEW Look and feel v8: Use a different picto for delete and unlink
2018-03-18 19:13:42 +01:00
Laurent Destailleur
ff765a2efe
FIX Look and feel v7
2018-03-16 12:16:40 +01:00
Laurent Destailleur
273e1cdd8d
FIX Look and feel v7
2018-03-16 10:14:14 +01:00
Laurent Destailleur
620ceb54e3
Clean code to avoid confusion
2018-03-15 14:25:09 +01:00
Laurent Destailleur
93f4d6fdcd
Translation
2018-03-11 21:34:38 +01: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
d92fa3a69c
Fix required field + space in dispatch
2018-03-09 23:49:40 +01:00
Maxime Kohlhaas
d82c62b638
Fix supplier order clone was keeping objectlinked
2018-03-09 21:51:59 +01:00
Regis Houssin
f4f81482e7
Fix: add todo if you use the good id by entities
2018-03-09 09:39:57 +01:00
Regis Houssin
ea175cd6c1
Fix: compatibility with multicompany dictionnary sharing
2018-03-09 09:37:23 +01:00
atm-ph
53ce297ab3
Fix travis - missing documentation of new param
2018-03-09 09:30:11 +01:00
Laurent Destailleur
ad96229ec4
Fix not visible template selector for supplier order/invoice emails
...
Conflicts:
htdocs/fourn/facture/card.php
2018-03-08 20:52:25 +01:00
Laurent Destailleur
e983e0709f
Fix not visible template selector for supplier order/invoice emails
2018-03-08 20:49:37 +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
Laurent Destailleur
5b8006a6bb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/payment/paymentok.php
htdocs/public/paypal/paymentok.php
2018-03-08 16:37:17 +01:00
Regis Houssin
93a9430e49
Fix: regression, restore primary key
2018-03-08 07:41:54 +01:00
Laurent Destailleur
fe45e82e99
Fix use of table llx_c_paiement (param showempty was not used/set)
2018-03-07 19:00:38 +01:00
Laurent Destailleur
acc29ea163
FIX #8219
2018-03-07 16:19:13 +01:00
Laurent Destailleur
f4f009d877
FIX #8269
2018-03-07 16:10:40 +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
1765b09fda
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-05 11:05:38 +01:00
Marc de Lima Lucio
6a4a3c9e82
NEW: supplier credit notes: remove MAIN_FEATURES_LEVEL
2018-03-05 10:58:19 +01:00
Marc de Lima Lucio
451d943927
NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts)
2018-03-02 16:48:25 +01:00
Laurent Destailleur
a3350d12d8
css
2018-03-01 23:51:06 +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
9cf45266f5
NEW: supplier relative discounts
2018-02-27 16:30:39 +01:00
Marc de Lima Lucio
239e834913
FIX: supplier credit notes: remove handled TODO
2018-02-27 10:04:02 +01:00
Laurent Destailleur
0cc84ab92f
FIX Missing restore_lastsearch_values
2018-02-26 21:21:28 +01:00
Laurent Destailleur
3c552cec15
FIX Missing restore_lastsearch_values
2018-02-26 21:16:40 +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
Laurent Destailleur
502f219f7f
Merge pull request #8231 from hregis/7.0_entity
...
FIX missing object entity in fetch
2018-02-25 12:59:38 +01:00
Laurent Destailleur
d51355517b
Merge pull request #8216 from dolibarr95/patch-39
...
NEW Can dispatch if more than ordered (if hidden option set)
2018-02-25 12:30:32 +01:00
Regis Houssin
703d976b3b
Fix: missing object entity in fetch
2018-02-24 16:21:16 +01:00
Regis Houssin
b216249214
Fix: missing hook parameters
2018-02-24 15:01:29 +01:00
Laurent Destailleur
0a79550f43
Fix oldcopy must be saved before update_extras
2018-02-23 16:11:00 +01:00
atm-ph
d300b943e1
Fix wrong price on supplier order line
2018-02-23 15:10:25 +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
Marc de Lima Lucio
876ea3198f
FIX: handle type in supplier invoice list
2018-02-21 17:51:44 +01:00
Marc de Lima Lucio
34d84c6d5d
FIX: supplier credit notes: display link to discount in supplier credit note card
2018-02-21 17:15:16 +01:00
Laurent Destailleur
b4446764f8
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
Laurent Destailleur
72c1357c9b
NEW Section of files generated by mass action not visible if empty
2018-02-21 11:02:45 +01:00
Marc de Lima Lucio
cfdbef6bc3
NEW: supplier credit notes: display supplier discounts in supplier card
2018-02-21 09:31:01 +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
95be155010
FIX: supplier credit notes: harmonize discount filters
2018-02-20 12:26:29 +01:00
Marc de Lima Lucio
a4f2a2532d
FIX: supplier credit notes: use MAIN_FEATURES_LEVEL
2018-02-20 11:41:57 +01:00
Marc de Lima Lucio
bcb39e57fb
FIX: supplier credit notes: wrong credit note filter
2018-02-20 10:08:55 +01:00
Marc de Lima Lucio
a66f7b8bc8
FIX: supplier credit notes: wrong discount filters
2018-02-19 17:32:59 +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
924a9c392c
FIX: supplier credit notes: hide relative discounts until supported
2018-02-16 12:30:32 +01:00
Marc de Lima Lucio
7367769ec3
FIX: supplier credit notes: use correct rights in supplier invoice card
2018-02-16 11:59:51 +01:00
Marc de Lima Lucio
d2bb6a790b
NEW: supplier credit notes: display supplier discounts in supplier proposal card
2018-02-16 11:45:57 +01:00
Marc de Lima Lucio
905adab517
NEW: supplier credit notes: display supplier discounts in supplier order card
2018-02-16 11:23:59 +01:00
Marc de Lima Lucio
bd486e4cab
FIX: remove var_dump
2018-02-16 10:29:36 +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
Laurent Destailleur
6b74c79798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-02-15 15:34:17 +01:00
Laurent Destailleur
825a295294
FIX #8198
2018-02-15 13:28:15 +01:00
Laurent Destailleur
f1a9f81fb4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-02-14 22:19:59 +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
109c447171
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-12 03:21:37 +01:00
Romain DESCHAMPS
37ff46b05a
add missing links in supplier card boxes
2018-02-12 02:40:09 +01:00
Laurent Destailleur
eccdc9a075
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/langs/pt_PT/companies.lang
2018-02-08 15:20:24 +01:00
Laurent Destailleur
475b89bac1
Merge branch 'develop' into new_order_min_amount
2018-02-08 14:20:53 +01:00
Laurent Destailleur
074f4a3b46
Fix class not found when selecting project ref in lists
2018-02-06 00:34:14 +01:00
Laurent Destailleur
f57ea2682a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/notify.class.php
htdocs/societe/class/societe.class.php
2018-02-03 19:33:24 +01:00
Laurent Destailleur
d3a6342034
Fix regeneration of PDF after creation of payment.
2018-02-02 10:37:10 +01:00
atm-quentin
c80fa48225
FIX update_extras on fourn card
2018-02-01 09:31:04 +01:00
Laurent Destailleur
de0a8ba71f
Fix extrafields
2018-01-31 14:01:58 +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
Maxime Kohlhaas
9899a02630
Display alert if order total is under order min amount
2018-01-20 20:17:56 +01:00
Maxime Kohlhaas
6f248a6590
New allow to define order min amount
2018-01-20 20:17:56 +01:00
Laurent Destailleur
3871c694f6
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-01-17 19:50:33 +01:00
Laurent Destailleur
56d702e3c6
Fix missing property in tooltip
2018-01-17 16:26:24 +01:00
Laurent Destailleur
bc7bd77cea
Fix permission to open supplier order
2018-01-17 15:54:27 +01:00
Laurent Destailleur
d0680b429f
Fix name of file saved from tax document tab
2018-01-12 17:39:20 +01:00
Laurent Destailleur
5e7b814966
Fix responsive
2018-01-12 00:16:55 +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
florian HENRY
fdedd6f75b
fix 7963
2018-01-08 20:54:40 +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
60976c08e4
Merge pull request #8010 from atm-john/FIX_supplier_invoice_lines_extrafields_reception
...
Fix extrafields transmition from supplier order to supplier invoice : lines part
2018-01-04 20:57:20 +01:00
florian HENRY
25390e5f73
fix : linked object (new format of linked_object atribut on 6.0)
2018-01-03 17:03:00 +01:00
John
9180121999
Fix extrafields transmition from supplier order lines to supplier invoice lines
2018-01-02 12:06:11 +01:00
Laurent Destailleur
6676178435
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/contrat/card.php
2017-12-28 09:56:40 +01:00
Laurent Destailleur
3ac413084f
Merge branch '6.0' into 6.0
2017-12-28 08:46:22 +01:00
Ferran Marcet
1c7b99d3dc
Fix: Missing include for Project class
2017-12-26 12:13:35 +01:00
Laurent Destailleur
eab44f62b1
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
2017-12-21 14:35:33 +01:00
Laurent Destailleur
6a62e13960
FIX security vulnerability reported by ADLab of Venustech
2017-12-21 13:32:16 +01:00
Laurent Destailleur
4a5988accb
FIX security vulnerability reported by ADLab of Venustech
2017-12-21 12:52:19 +01:00
Laurent Destailleur
b03d0134a7
Filter on date extrafield timestamp and datetime disabled (not possible
...
yet)
2017-12-20 18:30:41 +01:00
Laurent Destailleur
2e87318b58
Fix sql error
2017-12-18 19:15:42 +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
af1028576d
Fix on search all (trim search + search from smartphone).
2017-12-12 11:31:30 +01:00
Laurent Destailleur
1251807f54
Fix several pb in links to projects on create page
2017-12-12 10:37:51 +01:00
Maxime Kohlhaas
8a39e2a413
Fix : no need for action button on cards, link is now available
2017-12-07 00:36:23 +01:00
Laurent Destailleur
93311e3817
FIX #7885
2017-12-05 12:31:57 +01:00
Laurent Destailleur
8019f73f99
Fix: protection to not delete invoice if invoice is in bookkeeping
2017-12-05 10:01:30 +01:00
Laurent Destailleur
46b281f703
Fix for #7697
2017-12-01 19:29:29 +01:00
fappels
cec490dff5
Fix dispatch not adapted for label to ref change for warehouse
2017-12-01 12:57:56 +01:00
Alexis ALGOUD
b2effa7cc8
fix travis
2017-11-30 11:36:35 +01:00
root
b7f26ea788
FIX add line bad price and ref
2017-11-30 11:10:01 +01:00
Laurent Destailleur
c1e6d35ca5
Merge pull request #7878 from atm-florian/dev_informize_extrafield_list_search
...
factorization of extrafields into list
2017-11-28 12:14:47 +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
florian HENRY
94285ae494
factorization of extrafeild into list
2017-11-27 15:24:29 +01:00
Laurent Destailleur
aaf08ade2f
Fix bug reported by scrutinizer
2017-11-25 11:21:31 +01:00
Laurent Destailleur
3db52b5f9e
Debug responsive of v7
2017-11-24 14:23:25 +01:00
Laurent Destailleur
6d5f2b2f21
Fix filters on surveys
2017-11-24 10:00:46 +01:00
Laurent Destailleur
9c22b5f335
Replace deprecated dol_print_graph with DolGraph
2017-11-23 20:24:05 +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
f68b2bdeca
Use the confirmation when deleting from mass action everywhere.
2017-11-15 11:39:11 +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
fdcbf082fd
Fix css
2017-11-12 19:39:02 +01:00
Laurent Destailleur
bf121f9b3c
Work on saving supplier_ref into database lines
2017-11-12 19:29:03 +01:00
Laurent Destailleur
836f6bf3c9
Fix search filter when using extrafields 'links'
2017-11-12 12:39:23 +01:00
Laurent Destailleur
7e1e710d28
Merge pull request #7796 from IonAgorria/fix-price-dynamic
...
Fix: price dynamic bugs
2017-11-11 17:49:00 +01:00
Laurent Destailleur
d1860b87f8
NEW Add a confirmation for all mass action 'delete'
2017-11-11 16:34:11 +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
1b28c45e2c
PERF Links in getNomUrl use only one tag a instead of 2.
2017-11-02 15:19:14 +01:00
Laurent Destailleur
e39c73a916
Fix translation
2017-11-02 14:16:28 +01:00
Laurent Destailleur
15272f6555
Return error code
2017-11-02 13:47:53 +01:00
Laurent Destailleur
d569218162
Fix 'separate' extrafields must be visible by default.
...
Sandardize name of list pages (must end with _list.php)
2017-10-29 11:23:20 +01:00
Laurent Destailleur
e31223d7be
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-27 02:33:14 +02:00
Laurent Destailleur
6b7c59635e
Merge pull request #7715 from grandoc/new_branch_26_10_17
...
Fix : Warning: A non-numeric value encountered in on line 57 58 59
2017-10-27 02:18:26 +02:00
Laurent Destailleur
61909d842d
Update document.php
2017-10-27 02:18:11 +02:00
Laurent Destailleur
8058712d47
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/contrat/class/contrat.class.php
htdocs/product/list.php
2017-10-26 17:06:11 +02:00
Laurent Destailleur
67208b111d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
htdocs/expedition/card.php
htdocs/product/list.php
2017-10-26 17:02:40 +02:00
Philippe GRAND
d9d4b6e06d
Fix : Warning: A non-numeric value encountered in on line 57 58 59
2017-10-26 13:03:39 +02: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
be0cd601a9
Fix dead code
2017-10-22 14:07:54 +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
TuxGasy
9c3805c0d5
Fix anchor after add line
2017-10-19 14:10:58 +02:00
Laurent Destailleur
7f85d73001
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contrat/card.php
htdocs/expensereport/card.php
htdocs/fichinter/list.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/paiement/card.php
htdocs/livraison/card.php
htdocs/modulebuilder/template/myobject_list.php
htdocs/societe/rib.php
htdocs/supplier_proposal/list.php
htdocs/user/card.php
2017-10-18 19:51:29 +02:00
Laurent Destailleur
8626d6279a
Fix perm to delete files
2017-10-18 17:21:30 +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
5998f60764
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-10-17 10:51:21 +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
626fea3f7a
Merge pull request #7608 from atm-john/fix_supplier_invoice_from_supp_order
...
Fix extrafields transmition from supplier order to supplier invoice
2017-10-16 20:22:26 +02:00
Scrutinizer Auto-Fixer
bd5bffa72c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-16 06:47:05 +00:00
Laurent Destailleur
4296df45af
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/projet/list.php
htdocs/user/card.php
2017-10-13 22:01:56 +02:00
Laurent Destailleur
807724e0f0
Add link other invoices of third party on supplier card to
2017-10-13 21:32:05 +02:00
Laurent Destailleur
5092c41d94
Look and feel v6
2017-10-13 20:04:11 +02:00
Laurent Destailleur
1f2555d7c6
Add link other invoices of third party on supplier card to
2017-10-13 19:51:36 +02:00
Scrutinizer Auto-Fixer
165741517e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
7c9993ef0e
Various fixes
2017-10-13 12:14:57 +02:00
Laurent Destailleur
8c5cf9ea45
Fix date output
2017-10-12 18:04:47 +02:00
Laurent Destailleur
68ec8ef313
Fix lang missing
2017-10-11 12:05:48 +02:00
Laurent Destailleur
538c7579ba
Merge pull request #7502 from fappels/6.0_fix_dispatch
...
FIX : #7211 Update qty dispatched on qty change
2017-10-11 11:59:45 +02:00
John
b213c7ed24
Fix extrafields transmition from supplier order to supplier invoice
2017-10-10 14:15:06 +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
7767f03e9c
WIP: reuse actions_builddoc to build/remove supplier payment doc.
2017-10-05 10:44:08 +01: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
a501a20487
NEW Search filters in lists are restored when using "back to list"
2017-10-03 16:00:52 +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
09e71f1390
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-10-02 11:51:27 +02:00
Laurent Destailleur
03c08b1de4
Merge pull request #7507 from dolibarr95/patch-20
...
Line missing (error 500)
2017-10-02 00:10:03 +02:00
Laurent Destailleur
f007f9e7e5
NEW Add new property visible dy default on lists on extrafields
2017-09-29 13:26:44 +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
dolibarr95
3849da4fe4
Line missing (error 500)
...
Create an instance of ProductFournisseur.
2017-09-27 09:09:38 +02:00
Laurent Destailleur
8ae798f2e5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-26 22:11:27 +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
d232f8e3d5
Merge pull request #7500 from dolibarr95/patch-19
...
Try to fix 7492
2017-09-26 20:57:37 +02:00
Laurent Destailleur
7cf1a41853
Try to replace error into warning, so we can still make the order if qty too low
2017-09-26 20:57:09 +02:00
fappels
7d965f58d6
Clean code
2017-09-26 16:21:28 +02:00
fappels
d4488cb040
Fix for 'lessone' mode
2017-09-26 15:44:40 +02:00
dolibarr95
7b106bc642
Try to fix 7492
...
check if enough quantity
2017-09-26 14:13:11 +02:00
fappels
2fe0736b87
Update qty dispatched on qty change
...
Store qty dispatched and qty ordered only once per orderline
2017-09-26 12:32:50 +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
fe55feb82f
FIX #7461
2017-09-25 19:45:01 +02:00
Regis Houssin
d592664150
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-09-25 06:48:26 +02:00
Laurent Destailleur
e3da4188e2
GETPOST must not clean data for text input.
2017-09-25 00:16:52 +02:00
Laurent Destailleur
270aba99fa
FIX #7471
2017-09-24 23:28:48 +02:00
Laurent Destailleur
934edd9f5a
Merge branch 'develop' into 6.0-api
2017-09-24 22:01:07 +02:00
Laurent Destailleur
91d303465d
NEW Can add html content on right of tabs
2017-09-24 01:39:06 +02:00
Regis Houssin
77fea1983c
Fix: wrong supplier product price id
2017-09-20 16:57:38 +02:00
Maxime Kohlhaas
5383df5246
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
2017-09-18 09:58:15 +02:00
Regis Houssin
a03ef95eaa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/tables/llx_c_payment_term.sql
2017-09-18 09:11:04 +02:00
Laurent Destailleur
ab5724e7ff
Mutualize code for forms to send emails. Remove thousand line of code.
2017-09-17 17:12:14 +02:00
Laurent Destailleur
e014ac6ea9
NEW Send by email available in bulk for expense report
2017-09-16 22:03:25 +02:00
Laurent Destailleur
432df8eacf
NEW Enabled sending email in bulk actions for supplier orders
2017-09-16 20:31:33 +02:00
Laurent Destailleur
630dc92a13
NEW Mass PDF Merging is available on contracts
2017-09-16 15:39:52 +02:00
Laurent Destailleur
ad40d27324
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
2017-09-16 12:22:18 +02:00
Laurent Destailleur
ff7a17eb96
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/compta/facture.php
2017-09-16 12:17:30 +02:00
Laurent Destailleur
e4767b1a51
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture/fiche-rec.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
2017-09-16 12:11:18 +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
e02c220c08
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-15 11:04:27 +02:00
Laurent Destailleur
cce1549f66
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/commande/card.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/card.php
htdocs/public/members/new.php
2017-09-15 11:02:34 +02:00
Laurent Destailleur
0873260b8a
USe second parameter in GETPOST
2017-09-15 10:50:50 +02:00
Laurent Destailleur
d9947f2374
Update card.php
2017-09-14 13:24:24 +02:00
Laurent Destailleur
2de76d733b
Update card.php
2017-09-14 13:24:01 +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
TuxGasy
f0983353f2
Fix #7387 : filter clsed company when create new documents
2017-09-14 12:01:35 +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
Laurent Destailleur
149ab80b3a
The event array of an object is visible even if no event yet recorded.
2017-09-13 14:18:36 +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
Laurent Destailleur
71ce82b6b9
NEW Better autoselect customer or supplier fields to save clicks
2017-09-12 16:51:10 +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
Regis Houssin
b5de8da3a6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-09-11 08:07:55 +02:00
Laurent Destailleur
259cca0230
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
2017-09-08 13:30:54 +02:00
Laurent Destailleur
03fe9d4e97
Escape all status
2017-09-08 13:23:12 +02:00
fappels
7c743eb7da
Rename $extrafields because already used
2017-09-07 21:04:15 +02:00
Juanjo Menent
7648d300b5
FIX: Bad link to unpayed suppliers invoices
2017-09-07 17:13:48 +02:00
Laurent Destailleur
bde293af22
Fix filter on extrafield with type sellist
2017-09-07 15:34:25 +02:00
fappels
237270a27e
Add missing transfer of line extrafields in create invoice from supplier order
2017-09-05 21:40:04 +02:00
Laurent Destailleur
4dd58a94f3
Update list.php
2017-09-04 10:54:50 +02:00
Marcos García
eb9e8c9dfc
FIX #7000 Dashboard link for late pending payment supplier invoices do not work
...
Close #7000
2017-09-03 12:42:05 +02:00
Regis Houssin
8e8f94df11
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture-rec.class.php
2017-08-30 19:33:23 +02:00
Laurent Destailleur
d5c345d5cd
Merge pull request #7301 from aspangaro/7.0-1
...
NEW Add search field for date on supplier payment page
2017-08-29 18:23:18 +02:00
Laurent Destailleur
7aa09d8b71
NEW Can create thirdparty from card proposal, order or invoice
2017-08-28 18:37:16 +02:00
Alexandre SPANGARO
bc2ed17703
Merge remote-tracking branch 'uptream/develop' into 7.0-1
...
# Conflicts:
# htdocs/fourn/facture/paiement.php
2017-08-28 14:54:16 +02:00
Laurent Destailleur
a60cd49fb0
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
htdocs/core/class/CMailFile.class.php
htdocs/filefunc.inc.php
2017-08-28 12:53:02 +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
Alexandre SPANGARO
f6604f6578
Fix: Search on supplier payment list doesn't work
2017-08-28 06:16:31 +02:00
Alexandre SPANGARO
afdc96ef26
New : Add search field for date on supplier payment page
2017-08-28 06:10:28 +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
Laurent Destailleur
b3d1cdf84c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/card.php
2017-08-22 10:11:32 +02:00
Laurent Destailleur
9be342bd25
Fix missing $form
2017-08-22 10:02:45 +02:00
Laurent Destailleur
4d46b2ae58
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/filefunc.inc.php
2017-08-17 22:21:30 +02:00
Laurent Destailleur
744f0ab198
Merge remote-tracking branch 'origin/5.0' into 6.0
2017-08-17 22:03:26 +02:00
Norbert Penel
c82f363c10
Fix link
2017-08-14 13:21:47 +02:00
Laurent Destailleur
4d26dffa7d
FIX No way to add new line in supplier orders
2017-08-13 23:17:34 +02:00
Laurent Destailleur
9ad2a9ac85
Merge pull request #7248 from fappels/4.0_fix_best_buy_price_calculation
...
FIX Best buy price calculation
2017-08-10 13:51:01 +02:00
Laurent Destailleur
2a59dbbc89
Merge pull request #7243 from altatof/fix_fourcard_hooks
...
FIX : supplier id was not passed to hooks
2017-08-10 13:44:43 +02:00
delcroix Patrick
e96eadb5e7
FIX: remove order rights on invoice page
2017-08-09 23:15:49 +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
altatof
2be75420ca
FIX : supplier id was not passed to hooks
2017-08-07 10:21:38 +02:00
Laurent Destailleur
fa752348c8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/index.php
htdocs/contact/list.php
htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +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
Maxime Kohlhaas
e1dd85d261
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
2017-07-27 10:05:00 +02:00
Regis Houssin
acd5780e32
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-26 08:58:56 +02:00
florian HENRY
d6d454edc8
fix : Various misspelling class (eclipse Oxygen standard PHP control)
2017-07-25 13:32:27 +02:00
Laurent Destailleur
149e1f9c67
Merge pull request #7195 from atm-florian/6.0
...
fix : Various misspelling class (eclipse Oxygen standard PHP control)
2017-07-25 13:31:40 +02:00
Laurent Destailleur
aa9b4ce1f3
Fix too long combo for tags
2017-07-25 09:49:08 +02:00
florian HENRY
b9d5f4ba10
fix : Various misspelling class (eclipse Oxygen standard PHP control)
2017-07-24 09:02:32 +02:00
Laurent Destailleur
25b107defb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/contrat/list.php
htdocs/fichinter/list.php
2017-07-23 19:09:00 +02:00
Regis Houssin
26df1389f4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-07-21 20:42:21 +02:00
Laurent Destailleur
d07741ada1
Merge branch 'develop' into patch-rib
2017-07-21 14:58:33 +02:00
Maxime Kohlhaas
4cab48a000
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
2017-07-19 08:06:54 +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
phf
885fc3c5b7
Fix lost search value in list if come from thirdparty card
2017-07-17 11:04:48 +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
644486b4a0
Fix css
2017-07-15 17:32:36 +02:00
Laurent Destailleur
0fc56d2bcd
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-14 15:26:03 +02:00
Laurent Destailleur
e551c0a665
Fix autofill of amount on supplier payment page
2017-07-14 15:22:30 +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
Laurent Destailleur
bbc8994d36
Fix css
2017-07-14 13:28:21 +02:00
Laurent Destailleur
2870798d07
Fix remove warnings
2017-07-13 00:35:10 +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
e3943155f3
Sync transifex
2017-07-09 19:32:35 +02:00
Maxime Kohlhaas
ba283377b9
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
2017-07-09 10:13:02 +02:00
Laurent Destailleur
f40afcf023
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/facture/list.php
htdocs/compta/paiement/class/cpaiement.class.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stats/facture.php
2017-07-08 18:32:34 +02:00
Laurent Destailleur
9f486716c1
Fix phpcs
2017-07-08 14:56:43 +02:00
Laurent Destailleur
bd0dba6439
Update card.php
...
Better fix for future
2017-07-07 20:14:47 +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
4b11921cb6
Merge pull request #7087 from OPEN-DSI/core_fourn_command_link_now_order_date_and_delivery_date
...
FIX: In supplier order, show link Now for order date and delivery date
2017-07-07 19:18: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
jfefe
a072b23a5e
FIX #7075 : bad path for document
2017-07-06 00:47:26 +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
KHELIFA
62f8aa8b40
Fix: In supplier order, show link Now for order date and delivery date
2017-06-29 16:49:30 +02:00
Regis Houssin
fa247ffd98
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-29 08:51:42 +02:00
Laurent Destailleur
6f82837b0f
Fix GETPOST of lang_id
2017-06-27 17:27:01 +02:00
Laurent Destailleur
77ba5a8c24
Fix reception of product interface
2017-06-27 14:02:01 +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
Juan Bautista Mesa Roldán
0f5dc90bae
Fixing pages warning when value is null
2017-06-24 16:45:45 +02:00
Laurent Destailleur
4102403482
Look and feel v6
2017-06-21 11:37:34 +02:00
Regis Houssin
2fffd2fa6f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-20 23:26:21 +02:00
Laurent Destailleur
08a86fa03d
Start #6981
2017-06-20 12:17:13 +02:00
Maxime Kohlhaas
166b5da560
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into 5.0
2017-06-20 09:29:26 +02:00
Regis Houssin
909826e24f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-20 06:25:35 +02:00
Laurent Destailleur
bb2d27280b
Fix sort link must be disabled for computed field
2017-06-19 14:31:08 +02:00
Regis Houssin
544d051fe3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-19 07:06:57 +02:00
Laurent Destailleur
86a6a83647
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
2017-06-18 21:13:48 +02:00
Laurent Destailleur
abe736c6a6
Escape hml tags
2017-06-18 19:42:59 +02:00
Regis Houssin
cd095e99c9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-14 12:16:10 +02:00
Laurent Destailleur
1b56e4a01c
Fix look and feel v6
2017-06-14 11:28:42 +02:00
Laurent Destailleur
b889db997a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/datepicker.php
htdocs/core/get_menudiv.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/search_page.php
htdocs/main.inc.php
htdocs/master.inc.php
htdocs/product/list.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/card.php
htdocs/user/index.php
2017-06-14 10:48:34 +02:00
Laurent Destailleur
0e867229db
FIX Can't create invoice if PO disapproved
2017-06-14 10:28:02 +02:00
Laurent Destailleur
7939daa225
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
htdocs/user/index.php
2017-06-14 10:18:24 +02:00
Laurent Destailleur
83a5b8e078
FIX Can set supplier invoice to billed.
2017-06-14 10:13:33 +02:00
Regis Houssin
d1233755f6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-11 11:41:02 +02:00
Laurent Destailleur
a96362e2f9
Fix #formmailbeforetitle not supported everywhere
2017-06-11 11:40:01 +02:00
Regis Houssin
cc75916599
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-11 11:26:24 +02:00
Laurent Destailleur
961594afad
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-06-11 10:38:09 +02:00
Laurent Destailleur
e93cefbbf0
FIX #6985
2017-06-11 10:37:58 +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
Laurent Destailleur
43eb080242
Merge pull request #6970 from atm-ph/fix_6944
...
Fix 6944 compatibility PHP7 and missing parameter to call delete func…
2017-06-11 00:32:43 +02:00
Laurent Destailleur
b19e0e3cae
Create card.php
2017-06-11 00:31:58 +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
Laurent Destailleur
7c0de18ac1
Fix code comment
2017-06-10 12:56:28 +02:00
Regis Houssin
fa58f0f3e8
Fix: add entity filter
2017-06-09 09:25:15 +02:00
Laurent Destailleur
b441c62e1d
Fix syntax error
2017-06-08 14:55:12 +02:00
Laurent Destailleur
b1f93ccb0c
Fix security
2017-06-08 14:33:46 +02:00
Regis Houssin
2b36135641
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175
Maxi debug of v6
2017-06-07 19:28:31 +02:00
Regis Houssin
bfd6116e5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2017-06-06 15:03:36 +02:00
Laurent Destailleur
02b5d9e6f7
FIX #6945
2017-06-06 10:53:53 +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
2da50f1eca
Look and feel v6
2017-05-23 01:32:19 +02:00
Laurent Destailleur
f5e29d6c86
Fix phpcs warning
2017-05-22 10:45:02 +02:00
Laurent Destailleur
5992175b68
Standardize code between customer and supplier invoice list.
2017-05-21 03:23:44 +02:00
Laurent Destailleur
b3dc73e611
Look and feel v6
2017-05-21 02:43:51 +02:00
Laurent Destailleur
aec4cef5de
Clean some code for type of event deprecated since 3.3
2017-05-19 12:58:38 +02:00
Laurent Destailleur
7dbe3b1da9
Merge pull request #6843 from aspangaro/6.0-multijournal
...
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-18 17:45:21 +02:00
Laurent Destailleur
e2a7b0943f
Clean dead code
2017-05-17 14:52:27 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
Alexandre SPANGARO
becd023032
Fix : tooltip on supplier invoice payment
2017-05-15 05:11:00 +02:00
Alexandre SPANGARO
93554b7e30
Typo searchpicto
2017-05-14 21:06:33 +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
Laurent Destailleur
7ff35f57b4
Merge pull request #6802 from benlo06/FIX_CLASS_FOURN
...
Fix add forget column to Object FactureFournisseur
2017-05-10 22:44:46 +02:00
Laurent Destailleur
5e54567558
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/skeleton_list.php
2017-05-10 13:30:35 +02:00
Laurent Destailleur
3e0fcf5ec2
Fix label "total for this page" on last page.
2017-05-10 11:57:59 +02:00
Laurent Destailleur
e5c898e0d6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/fichinter/list.php
htdocs/product/list.php
htdocs/projet/tasks/list.php
2017-05-10 00:48:27 +02:00
Laurent Destailleur
6d01bd712d
FIX Better sanitizing of search all parameter.
2017-05-09 19:36:10 +02:00
Laurent Destailleur
d7d212bbe1
Fix bad link to list
2017-05-08 12:31:37 +02:00
Benoit
0fbf27895a
Add fk_facture_fourn element to fetch lines objects
2017-05-05 22:33:34 +02:00
Laurent Destailleur
11b1a2adac
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
2017-05-05 14:49:25 +02:00
Laurent Destailleur
2120b9af85
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/theme/eldy/style.css.php
2017-05-05 14:14:21 +02:00
Laurent Destailleur
8a37eeea74
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-05-05 14:02:02 +02:00
Laurent Destailleur
65e03ca3ba
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-05 12:34:22 +02:00
Laurent Destailleur
68b63927e0
Maxi miscellaneous debug
2017-05-05 12:33:49 +02:00
Guillaume T. (Arck Consulting)
ef0d395a1a
[FIX] Credit Note for fourn doesn't work, missing filed in create method & attribut
2017-05-05 09:49:44 +02:00
Laurent Destailleur
ce05c74e47
NEW SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT
2017-05-04 17:48:52 +02:00
Laurent Destailleur
ea58fb0b50
Fix triggered error
2017-05-04 15:52:12 +02:00
Laurent Destailleur
cfde27820e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/translation.php
htdocs/comm/card.php
htdocs/core/menus/standard/eldy.lib.php
2017-04-27 17:20:40 +02:00
Laurent Destailleur
5e856e6923
More complete tooltip help to describe available substitution vars
2017-04-27 17:16:19 +02:00
Marc de Lima Lucio
56e749df9f
FIX: supplier order line were always created with rang = 0
2017-04-26 16:12:27 +02:00
Juanjo Menent
c8b0921c51
Merge pull request #6702 from joseplluis/patch-7
...
NEW Show local taxes in supplier facture list
2017-04-16 11:05:19 +02:00
Laurent Destailleur
4c056d68d8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/commande/list.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/bills.lang
htdocs/societe/list.php
2017-04-15 17:02:05 +02:00
Maxime Kohlhaas
6c5b329dd1
Fix : display bank on supplier payment as on customer payment
2017-04-14 14:51:39 +02:00
Laurent Destailleur
846204bdb4
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 13:02:29 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
Josep Lluís
e67ae3665e
NEW Show local taxes in supplier facture list
...
Show localtax1 and localtax2 in supplier facture list, only if they are enabled in company config
2017-04-13 09:12:01 +02:00
Laurent Destailleur
a6b05bb4da
Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0
2017-04-12 14:08:58 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
Laurent Destailleur
2446cb5431
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture.php
htdocs/compta/facture/fiche-rec.php
htdocs/contact/list.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/facture/card.php
htdocs/societe/list.php
htdocs/user/document.php
2017-04-11 11:43:54 +02:00
Laurent Destailleur
17da4f64a7
Merge pull request #6683 from marcosgdf/bug-6679
...
FIX #6679 User with restricted supplier invoice permissions can edit project, payment conditions, payment mode
2017-04-11 11:21:14 +02:00
Laurent Destailleur
4d72165288
Merge pull request #6681 from marcosgdf/bug-6680
...
FIX #6680 User with restricted supplier invoice permissions sees "reopen" button even if he has no permission to do it
2017-04-11 11:20:52 +02:00
Laurent Destailleur
abf87a6946
Merge branch '4.0' into fix_reffourn
2017-04-11 11:00:35 +02:00
Marcos García de La Fuente
12df7b6ab9
FIX #6679 User with restricted supplier invoice permissions can edit project, payment conditions, payment mode
...
Close #6679
2017-04-09 18:09:08 +02:00
Marcos García de La Fuente
59fa5c2fe6
FIX #6680 User with restricted supplier invoice permissions sees "reopen" button even if he has no permission to do it
...
Close #6680
2017-04-09 17:38:59 +02:00
Laurent Destailleur
52c86cb3f5
NEW Bulk actions available on supplier orders
2017-04-09 13:12:25 +02:00
Laurent Destailleur
be439f6252
Work on look and feel v6
2017-04-07 16:16:44 +02:00
Laurent Destailleur
60a54041c2
NEW Enable bulk actions delete on supplier invoices
2017-04-07 14:09:19 +02:00
altatof
919633b2be
escape supplier ref
2017-04-07 12:10:01 +02:00
altatof
a6ec22d7fe
FIX: dont lose supplier ref if no supplier price in database
2017-04-07 12:06:15 +02:00
florian HENRY
7668702806
fix: missing attribute update
2017-04-07 08:56:10 +02:00
Laurent Destailleur
216bce608d
Work on v6 look and feel
2017-04-06 23:28:06 +02:00
Laurent Destailleur
d99b0461c7
Extrafields multilanguage support.
2017-04-03 10:56:28 +02:00
Laurent Destailleur
d975e7f442
Work on 6.0 look and feel
2017-04-01 12:46:47 +02:00
Laurent Destailleur
aca1c1944d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/data/llx_c_action_trigger.sql
2017-03-30 12:02:27 +02:00
Laurent Destailleur
f194ba6e09
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-03-29 11:48:35 +02:00
Laurent Destailleur
e416ea275e
Work on 6.0 look and feel
2017-03-28 21:04:38 +02:00
Laurent Destailleur
90a90e1a3c
FIX #6533 #6590
2017-03-28 12:45:09 +02:00
Laurent Destailleur
3740137e31
Add tooltip on label of each open item.
2017-03-28 10:44:52 +02:00
BENKE Charlie
3299e5f889
PRODUCT_PRICE_SUPPLIER_NO_LOG test inverted
...
if PRODUCT_PRICE_SUPPLIER_NO_LOG is empty, no log is stored
if PRODUCT_PRICE_SUPPLIER_NO_LOG is not empty log is stored
they are inversion
@eldy maybe add more field in this table
2017-03-26 19:13:10 +02:00
BENKE Charlie
8d6819c664
Update list.php
2017-03-26 01:50:12 +01:00
Laurent Destailleur
106d19a8af
FIX #6468 + Fix missing translation
2017-03-25 03:53:11 +01:00
BENKE Charlie
db76a05d0c
Update list.php
2017-03-24 23:53:32 +01:00
Laurent Destailleur
f241bfefd0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-23 20:20:59 +01:00
Laurent Destailleur
2062047dea
Merge pull request #6555 from atm-gauthier/5.0_fix_originid_on_supplierorder
...
FIX : origin & origin id on supplier order line
2017-03-23 20:03:58 +01:00
Laurent Destailleur
3adb43c6e5
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/langs/en_US/bills.lang
htdocs/product/class/product.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-03-23 12:52:19 +01:00
Laurent Destailleur
7df9c25e60
Several fixes on multicurrency
2017-03-23 12:44:20 +01:00
gauthier
a790ef9f7c
FIX : origin & origin id on supplier order line
2017-03-23 12:35:43 +01:00
Laurent Destailleur
1b0b4c9609
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-20 23:53:47 +01:00
Laurent Destailleur
b9a9997688
Page societe/soc.php and compta/facture.php was renamed into card.php
...
to match page naming conventions.
2017-03-20 21:29:22 +01:00
Laurent Destailleur
ac19aba07e
FIX multicurrency management on supplier order/invoice
...
Conflicts:
htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
2017-03-19 15:41:55 +01:00
Laurent Destailleur
b7442a0c1a
Fix bad vat rate used into sql request
2017-03-19 15:38:07 +01:00
Laurent Destailleur
e85206dee5
FIX multicurrency management on supplier order/invoice
2017-03-19 15:37:07 +01:00
Laurent Destailleur
75d73b188c
Fix bad vat rate used into sql request
2017-03-19 14:51:25 +01:00
Laurent Destailleur
4831fb4dcb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2017-03-19 11:26:49 +01:00
Laurent Destailleur
1e3c287eee
Merge pull request #6539 from simnandez/5.0
...
FIX #6537 Bug: SQL error: Missing , leads to wrong syntax
2017-03-18 04:33:14 +01:00
Juanjo Menent
5c028b30d5
Fix #6512 Bug: Invalid argument in when submitting orderstoinvoice.php-form
2017-03-17 17:05:59 +01:00
fappels
c1b21db407
Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0_fix_fourn_commande_class
2017-03-16 10:06:20 +01:00
fappels
f9c2bb0410
Fix create supplier order line label
...
Fix create line label
Fix read line rang, special_code and fk_parent_line
Remove create line rang, done by table default and $this->rang is
invalid, supplier order has no rang property.
2017-03-16 10:05:50 +01:00
Laurent Destailleur
7f8c4d7d0f
Fix CSS
2017-03-14 14:33:25 +01:00
Laurent Destailleur
c72e7c1057
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2017-03-10 14:54:35 +01:00
Laurent Destailleur
427f656bac
Merge pull request #6500 from atm-florian/4.0
...
FIX : Can use quote into supplier ref on order line add
2017-03-10 12:49:36 +01:00
Laurent Destailleur
a4b6388ba1
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2017-03-10 12:35:33 +01:00
Laurent Destailleur
6977daf76a
Merge pull request #6491 from atm-gauthier/4.0_fix_supplierinvoiceline_fetch
...
FIX : forgotten fk_facture_fourn attribute on supplierinvoice line ob…
2017-03-10 12:31:20 +01:00
Laurent Destailleur
cbd0444cd0
Merge pull request #6487 from tarrsalah/fix_fourn_restapayer
...
Fix the remainder to pay amount (#6486 )
2017-03-10 11:53:58 +01:00
florian HENRY
9b10c9f6d1
FIX : Can use quote into supplier ref on order line add
2017-03-10 09:19:42 +01:00
Laurent Destailleur
184d52525a
PHP code to manage pair/impair is replaced by native CSS.
2017-03-07 22:45:22 +01:00
gauthier
9eb3975803
FIX : forgotten fk_facture_fourn attribute on supplierinvoice line object
2017-03-07 15:18:20 +01:00
gauthier
b192b6cd50
FIX : multicurrency_subprice
2017-03-07 11:33:18 +01:00
gauthier
6e0589ce2c
FIX : load multicurrency informations on supplier order and bill lines fetch
2017-03-07 10:55:17 +01:00
Laurent Destailleur
d38818ff11
Fix option PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS not correctly
...
supported.
2017-03-06 13:01:04 +01:00
tarrsalah
bc7f4f3031
No need to recalculate $totalpaye.
2017-03-06 09:02:32 +01:00
tarrsalah
840408c1d2
Fix the remainder to pay amount ( #6486 )
...
The commit fix the remainder to pay amount (`$restapayer` value) in a
supplier invoice card.
2017-03-05 12:34:22 +01:00
Laurent Destailleur
4804cc47bd
Clean and uniformize code
2017-02-24 15:16:53 +01:00
Laurent Destailleur
fb88eaf2a4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-02-23 02:55:50 +01:00
Laurent Destailleur
aefdc09cdc
Fix missing MAIN_DISABLE_PDF_AUTOUPDATE
2017-02-22 14:33:44 +01:00
Laurent Destailleur
a0fb53d5b1
Merge branch 'develop' into NEW_pdf_supplier_payment
2017-02-22 14:20:47 +01:00
De Coninck Laurent
2ecf50a6cc
generate new pdf when validate billing
2017-02-21 19:33:32 +01:00
Laurent Destailleur
19e60f03b9
Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms
2017-02-21 14:17:44 +01:00
arnaud
4ec664029d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment
2017-02-17 16:40:14 +01:00
arnaud
977c18513d
FIX pdf supplier payment work
2017-02-14 12:00:56 +01:00
Laurent Destailleur
1dca3471db
Merge pull request #6409 from IonAgorria/supplierorder-oldline
...
FIX: Fill oldline in supplier order updateline
2017-02-12 20:45:20 +01:00
Laurent Destailleur
d72e5a3646
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-10 17:34:23 +01:00
arnaud
4230b075c2
INIT pdf supplier payment
2017-02-10 17:28:00 +01:00
Ion
2418754d71
Fill oldline in supplier order updateline
2017-02-08 23:27:58 +01:00
Laurent Destailleur
e0850b29cd
Merge pull request #6399 from fappels/5.0
...
Qual reputation for price supplier
2017-02-08 16:42:20 +01:00
fappels
a84c6f9b45
Qual reputation for price supplier
...
Move available reputation constants from view-controller to class
2017-02-08 13:35:34 +01:00
Laurent Destailleur
e1a6e6e4ab
Rename "attributes" into "variants" to avoid confusion with extrafields
2017-02-08 12:37:38 +01:00
Laurent Destailleur
b24f244f67
Merge pull request #5533 from marcosgdf/prod-attr
...
Feature Request: NEW Added product attributes feature
2017-02-08 11:20:33 +01:00
Laurent Destailleur
31c3398b7f
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/modules.php
2017-02-08 10:59:05 +01:00
Laurent Destailleur
dc0856413c
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-02-08 10:57:02 +01:00
Paris Liakos
eb452397bd
Wrong trigger when setting supplier invoice back to draft
2017-02-08 10:56:28 +01:00
Laurent Destailleur
8f52a34e71
Report of supplier payment is name "supplier_payments"
2017-02-06 20:37:42 +01:00
arnaud
7f6ab748c5
NEW add rapport file for supplier paiement
2017-02-03 16:42:06 +01:00
arnaud
480d099d81
Fix project filter traduction
2017-02-03 16:19:13 +01:00
Laurent Destailleur
bda915c63a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-03 15:34:59 +01:00
Marcos García de La Fuente
d06fb423c0
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/langs/en_US/products.lang
2017-02-02 20:07:41 +01:00
Laurent Destailleur
4d78e0d45c
FIX #6315
2017-02-02 02:53:32 +01:00
Laurent Destailleur
64da0e77d5
Merge pull request #6358 from defrance/patch-71
...
FIX : fill fourn remise percent with select product mode
2017-02-02 02:27:35 +01:00
Laurent Destailleur
cd6f5fb8cb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-02 02:26:09 +01:00
Laurent Destailleur
13f37b2cb9
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-02 02:25:49 +01:00
Laurent Destailleur
f6144b9ecb
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-02-02 02:24:57 +01:00
Laurent Destailleur
672e81d466
Merge pull request #6352 from philippe-opendsi/develop
...
NEW Option to reload supplier order and invoice create page
2017-02-02 01:23:53 +01:00
Laurent Destailleur
cfb317abdd
Merge pull request #6348 from atm-arnaud/FIX_project_filter_supplier_order
...
FIX Supplier Order list filter by project
2017-02-02 01:14:04 +01:00
Laurent Destailleur
c3fb559d3b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modProduct.class.php
2017-02-01 20:58:17 +01:00
Laurent Destailleur
fbbf8cd8a4
Fix bad side effect of uniformizing a constant name.
2017-02-01 15:47:08 +01:00
Laurent Destailleur
d945a0de92
NEW Uniformize behaviour: Action to make order is an action button.
2017-02-01 14:59:51 +01:00
BENKE Charlie
d84e50d15c
get remisepercent of product if select list
...
when we use the select list of product instead of free search we don't fill the remise
2017-01-31 23:11:16 +01:00
philippe-opendsi
399aea179f
New : Option to reload supplier order and invoice to retrieve payment terms & type
...
Add RELOAD_PAGE_ON_SUPPLIER_CHANGE
2017-01-31 10:15:04 +01:00
arnaud
c79137d14c
FIX Supplier Order list filter by project
2017-01-30 17:29:01 +01:00
Maxime Kohlhaas
7b6488b1c7
Fix numbering was disaplying technical error instead of error message
2017-01-27 10:05:57 +01:00
Laurent Destailleur
f919f70096
Merge branch 'develop' into develop
2017-01-27 01:46:21 +01:00
Laurent Destailleur
70091eceed
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/card.php
2017-01-27 01:26:11 +01:00
Laurent Destailleur
c39fcce9f1
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-26 10:45:38 +01:00
Ferran Marcet
cb5117ad06
Fix: Invalid variable. Shoud be $object
2017-01-25 16:08:46 +01:00
Ferran Marcet
7f87f6688b
Fix: Invalid variable. Shoud be $object
2017-01-25 12:58:21 +01:00
florian HENRY
dbae39b7b9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2017-01-25 10:34:32 +01:00
Laurent Destailleur
1878647d26
NEW Add statistics on supplier tab.
2017-01-23 20:54:52 +01:00
Laurent Destailleur
ecc6cb5596
Fix button at wrong place
2017-01-23 20:38:26 +01:00
Laurent Destailleur
00ea5d3de0
Mising translation
2017-01-23 10:32:14 +01:00
florian HENRY
7d7f1bf9ed
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2017-01-23 08:30:20 +01:00
Laurent Destailleur
bc10246d05
Fix bad amount on invoice. Table of supplier discount not yet available.
2017-01-22 23:19:14 +01:00
Laurent Destailleur
aa1ccad714
Fix permission
2017-01-22 23:08:11 +01:00
Laurent Destailleur
b011d6e188
Fix date of invoice in future.
2017-01-22 23:00:40 +01:00
Laurent Destailleur
39151d7a74
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64
Fix css and look 5.0
2017-01-22 12:13:32 +01:00
Laurent Destailleur
9a5670787f
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-21 12:26:50 +01:00
Laurent Destailleur
fc4aa96cd7
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/fichinter/card.php
htdocs/fourn/commande/dispatch.php
2017-01-20 21:02:05 +01:00
Ion
f23f2e61f5
Fix #6161 supplier order to facture not working
2017-01-20 18:09:26 +01:00
Laurent Destailleur
06abcbd4e9
Merge pull request #6305 from IonAgorria/fix-ordtoinv
...
Fix #6161 : supplier order to facture not working
2017-01-20 18:08:55 +01:00
Laurent Destailleur
412be59f78
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-01-20 12:09:39 +01:00
Ion
4d8df737f3
Fix #6161 supplier order to facture not working
2017-01-20 11:27:11 +01:00
Laurent Destailleur
8f577b0754
Fix bad link
2017-01-18 15:19:17 +01:00
Laurent Destailleur
7a0d388073
Fix if not defined, set default value from constant
2017-01-17 11:53:28 +01:00
Marcos García de La Fuente
e0cbcadd98
In case Model for document generation is not defined, the criteria to select the model is now:
...
1. Model for the object
2. Custom default module
3. Hardcoded default module
2017-01-16 21:16:05 +01:00
Laurent Destailleur
9c60474953
FIX #6277
2017-01-16 11:06:17 +01:00
Laurent Destailleur
4ecd657f34
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 00:02:43 +01:00
Laurent Destailleur
d14e4dbaba
Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on
2017-01-15 20:49:20 +01:00
Marcos García de La Fuente
d09a3628c5
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/compta/facture.php
2017-01-14 23:59:14 +01:00
Laurent Destailleur
6aa26e0f62
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/product/stock/massstockmove.php
htdocs/projet/info.php
htdocs/projet/tasks/time.php
htdocs/societe/class/societe.class.php
2017-01-13 16:49:18 +01:00
Juanjo Menent
bcba4a1a38
FIX #6253 Supplier invoice list filter does not respect "thirdparty" filter
2017-01-11 20:48:32 +01:00
Juanjo Menent
ac58fd91af
FIX #6253 Supplier invoice list filter does not respect "thirdparty" filter
2017-01-11 20:46:50 +01:00
Juanjo Menent
eb2ea07c76
FIX #6245 Thirdparty link in supplier invoices list, links to "comm/card" instead of "fourn/card" page
2017-01-11 20:32:39 +01:00
florian HENRY
c8c78dc9cf
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2017-01-06 14:48:05 +01:00
florian HENRY
c4f0433805
fix date echance
2017-01-06 14:47:57 +01:00
Laurent Destailleur
febd23fe41
Clean dead code
2017-01-03 11:22:03 +01:00
Laurent Destailleur
ec503d08f6
Fix dol_banner usage
2016-12-31 17:01:31 +01:00
Laurent Destailleur
b642a3a602
Prepare release 5.0
2016-12-31 16:35:56 +01:00
Marcos García de La Fuente
47a444b2ab
Merge branch 'develop' into prod-attr
2016-12-27 15:54:53 +01:00
aspangaro
5f861c1067
Merge remote-tracking branch 'Upstream/develop' into 5.0-17
2016-12-27 15:07:29 +01:00
Laurent Destailleur
82052450a6
Complete work on dol_banner
2016-12-26 18:21:18 +01:00
Marcos García de La Fuente
5669f734b8
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/comm/propal/card.php
# htdocs/commande/card.php
# htdocs/compta/facture.php
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-12-24 21:39:40 +01:00
aspangaro
b97135240c
Complete dol_banner_tab
2016-12-23 07:37:34 +01:00
aspangaro
ab8341cc8b
Presentation
2016-12-23 06:33:58 +01:00
Laurent Destailleur
9e44eb0d15
Fix return code REST similar for all api with POST
2016-12-23 02:08:22 +01:00
Laurent Destailleur
60b8582aa9
Fix more then 30 security defects
2016-12-18 01:44:26 +01:00
Laurent Destailleur
ecab7cb70e
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/class/product.class.php
2016-12-14 12:29:41 +01:00
Laurent Destailleur
43d18cd70c
FIX if a supplier price reference is changed after creating an order, we
...
can't clone order.
2016-12-13 13:22:24 +01:00
Laurent Destailleur
6c4f15df63
Fix lot of fix in css look to match v5 rules.
2016-12-11 16:11:42 +01:00
Jean-Pierre Morfin
a4e424ee0e
FIX updating supplier order line
2016-12-11 11:59:49 +01:00
Maxime Kohlhaas
a4a47a064c
fix missing commit and return
2016-12-11 02:50:31 +01:00
Maxime Kohlhaas
f7524b93ad
Actualize currency on supplier order and invoice
2016-12-11 02:50:21 +01:00
Maxime Kohlhaas
3d2143809b
Multicurrency on supplier order and invoice
2016-12-11 02:09:57 +01:00
Maxime Kohlhaas
707ca379c9
Fix currency on supplier order creation
2016-12-10 23:57:26 +01:00
Laurent Destailleur
bed23483d6
Merge pull request #6094 from benlo06/fix_list_fourn
...
Fix missing column in supplier list
2016-12-10 11:43:09 +01:00
Alexis Algoud
73f5254159
FIX #6031 search on login but fullname displayed
2016-12-10 11:35:34 +01:00
Laurent Destailleur
d5e417010f
Complete work on dol_banner
2016-12-09 11:16:04 +01:00
Benoit
9f51691ae4
Fix bug on fournisseur list
2016-12-09 00:15:59 +01:00
Laurent Destailleur
49f5ec6b52
Fix bugs reported by scrutinizer
2016-12-07 19:12:25 +01:00
Laurent Destailleur
1838670e31
Fix several security holes on api when used by external users
2016-12-07 19:02:39 +01:00
Laurent Destailleur
5edf215b74
Add missing api file
2016-12-05 13:32:08 +01:00
Laurent Destailleur
761a795294
Maxi debug on REST APIs
2016-12-05 13:31:29 +01:00
Laurent Destailleur
81a3235cf6
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/facture/list.php
2016-12-03 16:01:18 +01:00
Laurent Destailleur
22e2c3ed29
Fix missing pagination on supplier payments
2016-11-29 23:02:37 +01:00
Laurent Destailleur
bd8f923cee
Several fixes in filter on lists
2016-11-29 22:52:16 +01:00
Laurent Destailleur
e59edca855
Fix Responsive design
2016-11-27 20:55:59 +01:00
Marcos García de La Fuente
cf0ee36150
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-11-27 18:10:01 +01:00
Laurent Destailleur
8b569f9dfe
Try a fix for #6024
2016-11-27 17:17:29 +01:00
Laurent Destailleur
ad912bed04
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-11-27 17:10:25 +01:00
Laurent Destailleur
c362e7cf2d
FIX #6043 - Payment mode not visible on supplier invoice list
2016-11-27 17:10:07 +01:00
Laurent Destailleur
bf2b75f990
Merge pull request #6042 from IonAgorria/receive-trigger
...
FIX: Supplier order statut is not reverted if RECEIVE trigger fails
2016-11-27 16:27:40 +01:00
Laurent Destailleur
18a1f9033c
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/api/class/api_generic.class.php
htdocs/api/index.php
2016-11-27 16:25:38 +01:00
Laurent Destailleur
2c9edd4205
Maxi debug on list. Fix responsive design.
2016-11-27 13:49:46 +01:00
Laurent Destailleur
e4a8342aef
Fix div-table-form balance on all lists (solve responsive design)
2016-11-27 11:41:10 +01:00
Ion Agorria
f7a07f2491
Supplier order statut is not reverted on RECEIVE trigger fail
2016-11-26 22:13:31 +01:00
Laurent Destailleur
16ce156631
Fix responsive design
2016-11-25 18:32:52 +01:00
Regis Houssin
0322104e8e
Fix: use string instead integer
2016-11-24 17:27:32 +01:00
Laurent Destailleur
5acd09b2d5
Fix require_once instead of require.
2016-11-24 17:03:18 +01:00
Laurent Destailleur
da92be1a9f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fichinter/card.php
htdocs/fourn/facture/card.php
2016-11-22 20:55:57 +01:00
Laurent Destailleur
b10567f3b4
Fix bad css
2016-11-22 19:55:51 +01:00
Laurent Destailleur
f9f1f92d86
FIX #6025
2016-11-22 19:45:06 +01:00
Laurent Destailleur
ad981a0f07
FIX the key for getEntity was different for same element.
2016-11-18 12:54:08 +01:00
Laurent Destailleur
5539415354
FIX Remove hard coded value '1' for default payment term id. Use quick
...
hack by adding hidden constant to avoid this.
2016-11-15 10:43:03 +01:00
Laurent Destailleur
35d80aa209
Miscellaneous fixes
2016-11-12 12:40:06 +01:00
aspangaro
be65515aa9
Merge remote-tracking branch 'Upstream/develop' into 5.0-p34
2016-11-11 06:46:00 +01:00
Laurent Destailleur
66ff139030
Fix travis
2016-11-10 18:03:35 +01:00
aspangaro
f3da39c0a7
Add buttons to convert to reduction or money back
2016-11-10 06:51:15 +01:00
aspangaro
77eaa635fe
Align actions buttons
2016-11-10 06:29:11 +01:00
Laurent Destailleur
d1446bb7ef
NEW Show subtotal into list of linked elements
2016-11-08 19:19:30 +01:00
Laurent Destailleur
b4c20f1b1a
Fix regression in creation of invoice
...
Uniformize code
2016-11-08 11:23:40 +01:00
Marcos García de La Fuente
286095f5cd
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-11-06 15:01:40 +01:00
Laurent Destailleur
6ceb79cf5a
Uniformise look and feel
2016-11-03 20:55:55 +01:00
Laurent Destailleur
5b2a44f16f
Fix phpunit regression
2016-11-03 20:10:01 +01:00
Laurent Destailleur
b4fbbe7391
Merge pull request #5947 from aspangaro/5.0-p34
...
Work on supplier credit/deposit/replacement invoice
2016-11-03 11:27:10 +01:00
aspangaro
de8ed22448
Work on supplier credit/deposit/replacement invoice
2016-11-02 07:13:17 +01:00
Laurent Destailleur
e9edbba093
NEW Usage of vat code seems ok everywhere.
2016-10-29 21:02:08 +02:00
Laurent Destailleur
03b882d095
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
2016-10-29 19:12:58 +02:00
Laurent Destailleur
17c1b3f1d2
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2016-10-29 19:00:43 +02:00
Laurent Destailleur
78eaeab168
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-10-29 18:44:55 +02:00
aspangaro
efd24e5922
Work on supplier credit note
2016-10-29 07:45:24 +02:00
Maxime Kohlhaas
3dbab863a7
Fix : vars were not set after commande function
2016-10-28 10:24:31 +02:00
Laurent Destailleur
ff3a14319a
Merge pull request #5928 from bomuux/patch-1
...
Fix: price not properly rounded, VAT inconsistencies
2016-10-26 10:55:52 +02:00
Laurent Destailleur
b04230e38c
Merge pull request #5916 from aspangaro/5.0-p30
...
War against colspan - Supplier payment card
2016-10-26 10:41:19 +02:00
bomuux
3136895dc7
FIX: excl. tax price not properly rounded
...
When adding a 'free line' product or service in a supplier invoice, the amount excluding tax (HT) is not properly rounded, in particular when calculated from full tax price. This leads to inconsistencies in results when using large quantities or small precision in settings. Test case :
with default settings
MAIN_MAX_DECIMALS_UNIT = 5
MAIN_MAX_DECIMALS_TOT = 2
MAIN_MAX_DECIMALS_SHOWN = 8
Add in a new invoice a free product with 13.33 TTC (full tax), quantity 1, save, then edit the line with quantity 10111
Now in another invoice, add a free product with 13.33 TTC (full tax), quantity 10111, save.
Exact same data in the two invoices, but Tax and grand total are different, and false in second case because computed before rounding.
Also removed some direct access to $_POST array.
2016-10-26 08:55:43 +02:00
Laurent Destailleur
7c5ca155cb
Fix error
2016-10-25 19:21:08 +02:00
Juanjo Menent
94a884cea8
Fix: Use undeclared variable
2016-10-25 09:45:53 +02:00
Juanjo Menent
9ab25d4472
Fix: Use undeclared variable
2016-10-24 18:51:46 +02:00
Laurent Destailleur
f1421a2ee4
Rename constant with english name
2016-10-24 13:10:35 +02:00
Laurent Destailleur
0ae5a3799c
Fix html
2016-10-24 12:42:37 +02:00
aspangaro
845c770d01
War against colspan - Supplier payment card
2016-10-24 05:53:59 +02:00
Laurent Destailleur
39bc78909b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2016-10-24 03:35:43 +02:00
Laurent Destailleur
33a7b7037d
Save information of vat code into database
2016-10-24 03:23:40 +02:00
Laurent Destailleur
b5b76dfaf7
Merge pull request #5889 from atm-gauthier/NEW_filter_socid_on_find_min_price_product_fournisseur
...
FIX param socid so find_min_price_product_fournisseur() use correct thirdparty when we create supplierorder from supplierproposal
2016-10-24 01:06:15 +02:00
Laurent Destailleur
e388feee07
Merge pull request #5771 from defrance/patch-28
...
Add update_total function (like on other element)
2016-10-24 00:41:27 +02:00
Laurent Destailleur
468ff6795a
Merge pull request #5827 from aspangaro/5.0-p20
...
Work on supplier type (Replacement / deposit / credit note) invoice
2016-10-24 00:38:32 +02:00
Laurent Destailleur
9ab8f76777
Fix insert supplier invoice line
2016-10-22 18:40:21 +02:00
Laurent Destailleur
14e78ef50b
Mutualize code of 2 lists into one page.
2016-10-22 13:52:43 +02:00
Sergio Sanchis Climent
78f1b428b0
FIX: Search provider by price
2016-10-19 21:42:53 +02:00
gauthier
7d63925118
NEW : param socid find_min_price_product_fournisseur() function
2016-10-18 15:35:48 +02:00
Laurent Destailleur
912ac8e3d6
Fix css
2016-10-16 21:29:12 +02:00
Laurent Destailleur
15a7262328
Fix pb with multicurrency
2016-10-16 20:33:17 +02:00
Laurent Destailleur
ee1ee1eee7
Management of the "Copy of" when cloning projects.
2016-10-16 12:12:45 +02:00
Laurent Destailleur
dfbca2d0ad
Merge pull request #5868 from olsesacl/#5830
...
NEW: #5830 Allow Generic E-mail Sender
2016-10-15 02:43:19 +02:00
Laurent Destailleur
d27dea8320
NEW Can rename uploaded or generated files on all "documents" tabs.
2016-10-14 18:09:24 +02:00
Laurent Destailleur
28f64e78eb
Debug multicurrency
2016-10-13 21:25:13 +02:00
Laurent Destailleur
78e8ab64aa
Debug multicurrency
2016-10-13 21:17:46 +02:00
Sergio Sanchis Climent
8556dab68e
NEW: #5830
2016-10-13 16:44:17 +02:00
Laurent Destailleur
265131e815
Remove old comments
2016-10-04 12:54:02 +02:00
Laurent Destailleur
d81cd7ebbe
NEW Can link template invoice to other objects. Generated invoice will
...
be linked to same objects.
2016-10-04 11:14:00 +02:00
aspangaro
99271ca550
Merge remote-tracking branch 'Upstream/develop' into 5.0-credit_note
2016-10-03 20:42:34 +02:00
aspangaro
41b6101a75
Work on supplier type (Replacement / deposit / credit note) invoice
2016-10-03 20:41:39 +02:00
Laurent Destailleur
e17eea5ea5
Merge pull request #5825 from aspangaro/5.0-p20
...
Work on supplier type (Replacement / deposit / credit note) invoice
2016-10-03 00:50:08 +02:00
Laurent Destailleur
6ac39b97e4
Fix restore list of attached files into action report
2016-10-03 00:38:28 +02:00
aspangaro
a328e673a3
Work on supplier type (Replacement / deposit / credit note) invoice
2016-10-02 21:39:24 +02:00
Laurent Destailleur
fe7e600dd3
Merge pull request #5820 from IonAgorria/fixcloneline
...
FIX: cloned supplier order lines not having all parameters
2016-10-01 18:59:57 +02:00
aspangaro
cf883e0eeb
Update fournisseur.facture.class.php
2016-10-01 06:19:22 +02:00
Ion Agorria
0816cc87c3
Fix cloned supplier order lines not having all parameters
2016-09-30 20:09:59 +02:00
Laurent Destailleur
b2307f9b90
Uniformize code
2016-09-28 21:08:25 +02:00
altoch
77528d45c4
FIX: Filter search montant ht sql statement
2016-09-28 20:15:59 +02:00
Laurent Destailleur
86d86f8442
NEW #5801 More complete change to allow to disable supplier invoice
...
document generation
2016-09-28 18:59:44 +02:00
vinclar
00ebff816d
Correct filter refsupplier
...
Bad reference
2016-09-28 14:20:54 +02:00
Laurent Destailleur
100312aac2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/adherents/class/cotisation.class.php
2016-09-26 01:32:50 +02:00
Laurent Destailleur
ea09eb13da
Uniformize code
2016-09-26 00:10:29 +02:00
aspangaro
922495d72d
Correct travis & typo "Execuete"
2016-09-24 07:18:38 +02:00
Laurent Destailleur
d4e324d15a
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/facture.php
2016-09-21 18:38:30 +02:00
BENKE Charlie
f826013cb3
Update fournisseur.facture.class.php
2016-09-21 12:07:43 +02:00
BENKE Charlie
c713eb987e
Update fournisseur.facture.class.php
2016-09-21 12:06:39 +02:00
BENKE Charlie
cb736f5b93
Add update_total function (like on other element)
...
the goal is to have and use the same function in all the native standard element (proposal, order, bill / customer and fournish)
2016-09-21 12:05:18 +02:00
Laurent Destailleur
1c15539bb4
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-09-21 01:27:25 +02:00
Laurent Destailleur
f1bb69eecf
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-09-21 01:26:03 +02:00
Laurent Destailleur
c4c7ccc226
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/societe/note.php
htdocs/societe/rib.php
2016-09-19 14:05:16 +02:00
Laurent Destailleur
4f842fd2cb
Uniformize look and feel
2016-09-19 13:57:50 +02:00
Laurent Destailleur
d1c4f02bf7
Uniformize code and style
2016-09-18 14:41:17 +02:00
Laurent Destailleur
a4c3a4588d
FIX link "back to list" was not visible.
2016-09-18 14:12:49 +02:00
Laurent Destailleur
81590e3833
Merge pull request #5757 from IonAgorria/fix-sorder-insert
...
FIX: Wrong line insert trigger in supplier order
2016-09-17 17:47:16 +02:00
Ion Agorria
7fe0c4211c
Move order supplier deleteline code to line class
2016-09-17 02:35:02 +02:00
Ion Agorria
54756ef729
Fix wrong trigger in supplier order
2016-09-15 23:45:13 +02:00
Maxime Kohlhaas
5840ed8258
No ORDER BY needed for a COUNT sql, causes PGSQL error
2016-09-15 12:08:47 +02:00
Ion Agorria
2bc41a1fd0
Fix ref supplier not recorded in addline
2016-09-13 18:41:13 +02:00
Laurent Destailleur
0ab377440d
Complete param of setValueFrom
2016-09-12 20:16:39 +02:00
Laurent Destailleur
d6ea6d1725
Fix deprecated option should be on
2016-09-12 02:30:21 +02:00
Laurent Destailleur
9ff1809f85
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/card.php
htdocs/product/stock/class/productlot.class.php
htdocs/theme/eldy/style.css.php
2016-09-12 02:05:38 +02:00
Laurent Destailleur
1fbf233f95
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/expedition/list.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/fourn/commande/list.php
htdocs/product/reassort.php
htdocs/product/reassortlot.php
htdocs/product/stock/list.php
htdocs/societe/list.php
htdocs/supplier_proposal/list.php
htdocs/theme/eldy/style.css.php
2016-09-12 01:50:38 +02:00
Laurent Destailleur
c71fc18942
NEW Checkbox 'close order to "Everything received" automatically if all
...
products are received' is visible on supplier orders.
2016-09-12 01:05:45 +02:00
Laurent Destailleur
1bb278a587
Fix #5712
2016-09-11 23:01:04 +02:00
Laurent Destailleur
08dc7ade3b
Fix list of supplier price must show price compared to quantity.
2016-09-11 14:04:03 +02:00
Laurent Destailleur
9709c8bbbf
FIX inversion customer/supplier price
2016-09-11 13:48:45 +02:00
Laurent Destailleur
6e9e3e82ed
FIX inversion customer/supplier price
2016-09-11 13:48:05 +02:00
Laurent Destailleur
49e54d55d5
Removed old option PRODUCT_SHOW_WHEN_CREATE. It was bugged and not
...
usable.
2016-09-10 18:19:54 +02:00
Laurent Destailleur
1b00d55021
NEW New set of icon for status easier to understand.
2016-09-10 17:57:35 +02:00
Laurent Destailleur
4d9abbd710
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2016-09-09 18:35:26 +02:00
Juanjo Menent
6e39d83480
Merge remote-tracking branch 'upstream/3.9' into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2016-09-09 16:51:41 +02:00
Juanjo Menent
d8f50f9acd
Merge remote-tracking branch 'upstream/3.9' into 4.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2016-09-09 16:34:02 +02:00
Ferran Marcet
b5db70342b
Fix: Search all is lost on lists when pagination or when the columns are sorted
2016-09-09 13:58:41 +02:00
Laurent Destailleur
0debcf745a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/cron/card.php
htdocs/cron/list.php
htdocs/filefunc.inc.php
2016-09-09 09:32:14 +02:00
Juanjo Menent
e3c2299c67
Merge remote-tracking branch 'upstream/3.8' into 3.9
...
Conflicts:
htdocs/admin/dict.php
htdocs/fourn/class/fournisseur.commande.class.php
2016-09-08 18:52:44 +02:00
Philippe
972a2db3a3
No initialisation of the array before filling it. May cause some trouble when fetch is call several times and lines added or deleted
2016-09-08 11:40:39 +02:00
Laurent Destailleur
6d6eceb0ca
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-08 11:39:38 +02:00
aspangaro
2b43eb934f
Fix: Problem of presentation with index supplier command
2016-09-07 22:25:37 +02:00
Marcos García de La Fuente
05728075d6
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-09-06 21:06:33 +02:00
Laurent Destailleur
f440e78fa6
FIX quick search boxes when nojs or when using smartphone
2016-09-03 12:56:49 +02:00
aspangaro
688ac691a9
Uniformize presentation on suppliers invoices
2016-08-31 07:05:23 +02:00
Laurent Destailleur
fac28f9589
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/sociales/charges.php
htdocs/core/boxes/modules_boxes.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
2016-08-28 02:40:20 +02:00
florian HENRY
ba422615dd
better trigger management on supplier order
2016-08-25 14:38:16 +02:00
Laurent Destailleur
e22e243bc5
NEW Can set to paid automaically social or fiscal contributions after a
...
payment was recorded.
2016-08-22 14:31:15 +02:00
Laurent Destailleur
660fcacef2
Merge pull request #5619 from fappels/4.0_fix_sql_error_insert_supplier_order_line
...
Fix SQL error insert supplier order line
2016-08-17 16:10:38 +02:00
Laurent Destailleur
33ceb5d626
Merge pull request #5601 from aspangaro/4.0-p37
...
Uniformize title presentation on product/service card
2016-08-17 15:50:42 +02:00
fappels
b6f9aa4592
Fix SQL error insert supplier order line
...
$this->fk_multicurrency not set gives SQL error
2016-08-11 21:10:56 +02:00
florian HENRY
5bb3b5c074
FIX : MULTICURRENCY if value is 1,56 then GETPOST 'int' check return ''
2016-08-10 09:47:25 +02:00
aspangaro
a1d1396919
Uniformize presentation
2016-08-10 07:40:40 +02:00
Laurent Destailleur
4d4fc87e2b
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/product/stock/productlot_list.php
htdocs/websites/index.php
2016-08-09 13:26:08 +02:00
aspangaro
dd905debb4
Uniformize presentation
2016-08-09 10:19:42 +02:00
Laurent Destailleur
2133b1c3b5
NEW Table with list of lots/serial can be viewed (module product batch).
2016-08-08 20:31:03 +02:00
Laurent Destailleur
126d9ae6bf
Merge pull request #5586 from atm-florian/dev_NEW_ClassOrderDeliverStatusOnStockVentil
...
NEW : Add workflow to calculated supplier order status on stock dispatch
2016-08-05 18:15:04 +02:00
florian HENRY
0176acd08f
fix travis
2016-08-05 16:15:30 +02:00
Laurent Destailleur
bcd055b378
Move button to link to, in same part of code than code to output links.
2016-08-05 15:30:28 +02:00
Laurent Destailleur
e168888c59
NEW Reduce nb of picto on ref into list, merging preview and download
2016-08-05 12:20:11 +02:00
florian HENRY
1e929e647d
better management of dispatch status
2016-08-05 10:02:36 +02:00
florian HENRY
0780188f4e
taking account @eldy remarks
2016-08-05 09:46:17 +02:00
florian HENRY
a39290022f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_NEW_ClassOrderDeliverStatusOnStockVentil
Conflicts:
htdocs/langs/en_US/workflow.lang
2016-08-05 09:34:27 +02:00
Laurent Destailleur
33d12a4492
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/admin.lang
2016-08-05 01:15:19 +02:00
Laurent Destailleur
bdf779dfd2
Merge pull request #5578 from aspangaro/4.0-p37
...
Uniformize presentation
2016-08-05 00:32:49 +02:00
Laurent Destailleur
9349f27742
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-08-04 17:10:02 +02:00
Laurent Destailleur
5126786d60
NEW Add option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED
2016-08-04 15:48:34 +02:00
Laurent Destailleur
7a7e7b330f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a
NEW Link between objects can be done on both side and on all objects
2016-08-04 11:57:37 +02:00
florian HENRY
4001bc474e
NEW : Add workflow to calculated supplier order status on stock dispatch
2016-08-04 11:37:32 +02:00
Laurent Destailleur
caa987fb61
Clean obsolete comment
2016-08-04 10:13:27 +02:00
aspangaro
27603b966e
Uniformize presentation on supplier order
2016-08-03 08:25:35 +02:00
Laurent Destailleur
abbe204c97
Fix design of option PROJECT_ADD_SUBTOTAL_LINES
2016-08-03 01:42:05 +02:00
Laurent Destailleur
f0c75388cb
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/compta/facture/class/api_invoice.class.php
htdocs/product/class/api_product.class.php
htdocs/societe/class/api_contact.class.php
htdocs/societe/class/api_thirdparty.class.php
2016-08-02 17:43:12 +02:00
Laurent Destailleur
d353a7863b
Fix ambiguos field
2016-08-02 17:39:23 +02:00
Laurent Destailleur
3ea7a1fcab
Fix strict mode
2016-08-02 17:36:24 +02:00
Laurent Destailleur
b267402df6
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/main.lang
htdocs/societe/rib.php
2016-08-01 15:15:32 +02:00
aspangaro
4a0eb496fa
Merge remote-tracking branch 'Upstream/4.0' into 4.0-p36
...
Conflicts:
htdocs/societe/rib.php
2016-08-01 07:27:49 +02:00
aspangaro
4ee4de4a00
Uniformize presentation supplier invoice
2016-08-01 07:21:24 +02:00
Laurent Destailleur
857de64607
Fix multicurrency
2016-07-30 16:41:10 +02:00
Laurent Destailleur
27243069cb
FIX #5535 bad dependency.
...
Conflicts:
htdocs/fourn/facture/list.php
2016-07-29 15:19:04 +02:00
Laurent Destailleur
4e3dd4c927
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-07-28 14:38:22 +02:00
Laurent Destailleur
801da08c76
FIX syntax error sql due to multicurrency
2016-07-28 14:10:43 +02:00
Laurent Destailleur
3639d30389
FIX Error is not returned
2016-07-28 14:07:59 +02:00
Laurent Destailleur
463a130a60
FIX #5457
2016-07-28 11:53:06 +02:00
Laurent Destailleur
209bb213c0
Merge pull request #5475 from IonAgorria/ordersup-trigger
...
New: Trigger for set status in supplier order
2016-07-28 09:48:04 +02:00
Ion Agorria
078439cf18
Use different trigger name per status
2016-07-26 19:53:29 +02:00
Marcos García de La Fuente
c082505021
NEW Added product attributes feature
2016-07-24 11:27:52 +02:00
Sergio Sanchis Climent
c101a6c483
update camel caps to update_total()
2016-07-19 13:56:48 +02:00
Sergio Sanchis Climent
76f17737be
change dolsyslog
2016-07-19 13:50:32 +02:00
Sergio Sanchis Climent
07b6c991ff
Create CommandeFournisseurLigne->insert
...
Create SupplierInvoiceLine->insert
2016-07-19 12:57:23 +02:00
Laurent Destailleur
490336b2e8
Fix bad dependency.
2016-07-12 20:07:53 +02:00
Laurent Destailleur
73f574b649
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/install/repair.php
2016-07-12 19:30:01 +02:00
Laurent Destailleur
dc138e20e7
FIX: Can't edit label
2016-07-12 10:58:32 +02:00
Ion Agorria
c596f8d9bd
New: Trigger for set status in supplier order
2016-07-10 23:05:51 +02:00
Laurent Destailleur
0f23cef46c
Fix warning of the repair tool.
2016-07-08 18:59:36 +02:00
Laurent Destailleur
9192587ef2
Fix duplicate records
2016-07-07 16:57:57 +02:00
Laurent Destailleur
061ccadd03
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/commande/list.php
htdocs/fourn/commande/orderstoinvoice.php
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/functions
htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/functions
htdocs/install/pgsql/functions/functions.sql
2016-07-06 15:11:29 +02:00
Laurent Destailleur
a8f06d78b1
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/install/pgsql/functions/functions.sql
2016-07-06 14:53:05 +02:00
fmarcet
50c5efc374
Fix: Don't load extrafields on orderstoinvoice
2016-07-05 16:41:46 +02:00
Laurent Destailleur
6a903b17e6
Merge pull request #5440 from frederic34/patch-8
...
FIX Search on billed
2016-07-02 20:30:51 +02:00
Frédéric FRANCE
0639bafa6b
Update list.php
2016-07-02 10:19:38 +02:00
arnaud
cf5de9d0c8
FIX form_confirm to delete payment on supplier invoice
2016-07-01 16:59:03 +02:00
Laurent Destailleur
05384b2f88
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/list.php
htdocs/projet/card.php
htdocs/societe/consumption.php
2016-07-01 02:39:29 +02:00
Laurent Destailleur
29e26c2342
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/lib/sendings.lib.php
2016-07-01 02:06:30 +02:00
Laurent Destailleur
c9300bae35
Merge pull request #5415 from fmarcet/3.8
...
Fix: Incorrect document link on supplier invoices's list
2016-06-30 22:31:18 +02:00
arnaud
38dcb0de49
FIX #4455
2016-06-30 16:53:24 +02:00
fmarcet
e4a2b5abb3
Fix: Incorrect document link on supplier invoices's list
2016-06-30 11:27:29 +02:00
Laurent Destailleur
f7427e7366
Fix css
2016-06-29 18:15:35 +02:00
Laurent Destailleur
9b1caefbf9
Fix bad var
2016-06-28 02:40:42 +02:00
Laurent Destailleur
b529a53501
Fix var not initialized
2016-06-28 02:36:40 +02:00
Frédéric FRANCE
7004dfbc15
typo
2016-06-25 09:57:46 +02:00
Laurent Destailleur
2767df2e01
FIX Solve problem of sending joinded files of another email when several
...
tabs are opened on form to send emails.
2016-06-24 16:10:52 +02:00
Laurent Destailleur
52f414ad73
Fix selection of visible fields on customer and supplier lists. Filters
...
are ok now. Order of list of fields in selection is same than in output
array.
2016-06-21 15:16:33 +02:00
Laurent Destailleur
8187dc2006
Fix css
2016-06-19 16:07:34 +02:00
Laurent Destailleur
9019576394
Fix css class opacitymedium was not used everywhere.
2016-06-07 15:58:02 +02:00
Laurent Destailleur
5db6bcd4a8
Fix contextpage lost on submitting form or sorting
2016-06-07 14:06:00 +02:00
Laurent Destailleur
cc8db0d0df
FIX #2605 Request 4 - Missing last supplier proposal on thirdparty card.
2016-06-06 21:26:31 +02:00
Laurent Destailleur
2918dcfde4
Fix missing include
2016-06-06 17:25:44 +02:00
Laurent Destailleur
293c8e145a
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/imports/import.php
htdocs/langs/en_US/admin.lang
2016-06-05 02:20:27 +02:00
Laurent Destailleur
c09dbe05b3
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/class/ldap.class.php
htdocs/expensereport/card.php
htdocs/langs/en_US/admin.lang
2016-06-05 00:25:08 +02:00
Laurent Destailleur
147212437b
FIX #4078 Edit inline of label of supplier invoice is ok.
2016-06-04 19:36:28 +02:00
Maxime Kohlhaas
3ef9fe2c40
Fix product supplier price modification with multicompany
2016-06-04 18:10:40 +02:00
Laurent Destailleur
c59c86e648
Merge branch 'develop' of https://github.com/aschio/dolibarr into
...
develop
Conflicts:
htdocs/fourn/facture/list.php
2016-06-04 14:55:02 +02:00
Laurent Destailleur
1748da6c56
Merge
2016-06-04 14:51:56 +02:00
Maxime Kohlhaas
bd2fe75d08
Fix menus in dashboard links
2016-06-04 14:45:03 +02:00
Laurent Destailleur
eb7a4c5ccf
FIX Creating a supplier order from proposal order
2016-06-04 02:39:13 +02:00
cla
e1c27216ce
FIX #4825
2016-06-04 02:20:11 +02:00
Laurent Destailleur
32b6766a7d
FIX #5195
2016-06-04 01:50:01 +02:00
Laurent Destailleur
ff6daebee6
FIX #5203
2016-06-04 01:19:27 +02:00
Laurent Destailleur
b57476153f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/consumption.php
2016-06-04 01:14:36 +02:00
Laurent Destailleur
085fa6902b
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/contrat/list.php
htdocs/fourn/ajax/getSupplierPrices.php
2016-06-04 00:58:16 +02:00
Laurent Destailleur
5c36aa3802
Merge pull request #5271 from aschio/develop
...
FIX #5192
2016-06-04 00:17:45 +02:00
cla
deb7c407ad
FIX #4643
2016-06-04 00:08:13 +02:00
Maxime Kohlhaas
8b0b3b1a9d
PMP available only if stock module enabled
2016-06-03 23:49:34 +02:00
cla
18424812db
closes #5192 .
...
I deleted the line and moved last_insert_id() functions 3 lines under
2016-06-03 23:49:08 +02:00
Laurent Destailleur
149c6916f8
FIX ##5263
2016-06-03 22:20:58 +02:00
Ion Agorria
6ba86e9d03
Fill ref_supplier in product supplier price
2016-05-26 20:53:01 +02:00
Laurent Destailleur
b8d5d6a383
Fix bad placeholder
2016-05-26 19:38:52 +02:00
Laurent Destailleur
a587ba496c
NEW Can select fields on supplier orders
2016-05-24 18:43:35 +02:00
Laurent Destailleur
e7072185ab
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/comm/propal.php
2016-05-18 20:47:57 +02:00
Laurent Destailleur
49c2549400
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/comm/propal.php
2016-05-18 20:40:09 +02:00
Laurent Destailleur
4e46a01d51
Fix regression introduced with option SUPPLIERORDER_WITH_NOPRICEDEFINED
2016-05-17 22:59:46 +02:00
Laurent Destailleur
3b99fb01ee
Fix duplicate table
2016-05-17 10:51:03 +02:00
Laurent Destailleur
75b4c61fbc
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/contrat/card.php
2016-05-17 00:02:54 +02:00
Maxime Kohlhaas
af8608ab7a
Fix services dispatch on supplier order only if STOCK_SUPPORTS_SERVICES
2016-05-16 10:49:43 +02:00
Laurent Destailleur
1bba8166f8
FIX #5207
2016-05-13 23:12:53 +02:00
Laurent Destailleur
06d0c261ad
Add TODO comment
2016-05-05 23:19:21 +02:00
Laurent Destailleur
f901453a6b
FIX addMoreActionsButtons hook must be inside the div class=tabaction.
2016-05-05 21:38:29 +02:00
Laurent Destailleur
c795803da1
FIX ref_supplier was not set. We also refered to old var names.
2016-05-05 20:19:56 +02:00
Laurent Destailleur
8a8e7cdf5e
Merge pull request #4686 from bafbes/abb-10
...
New + Fix : handle supplier orders from customer orders with id variable name correction
2016-05-05 20:07:42 +02:00
Laurent Destailleur
6ffb45f5d8
FIX Missing param user on update()
2016-04-30 13:58:35 +02:00
Laurent Destailleur
0cde6ad98f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/filefunc.inc.php
2016-04-29 20:43:42 +02:00
Laurent Destailleur
3d9456b202
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/fourn/facture/list.php
2016-04-29 20:42:35 +02:00
Laurent Destailleur
b94295e4ca
Merge pull request #5102 from atm-alexis/3.8
...
FIX search on date into supplier invoice list
2016-04-29 18:45:04 +02:00
Laurent Destailleur
b0977e3e2a
Merge pull request #5122 from fmarcet/3.8
...
FIX: Not filtering correctly when come from dashboard
2016-04-29 17:40:03 +02:00
Laurent Destailleur
8a4871323d
Merge pull request #5022 from marcosgdf/bug-5008
...
FIX #5008 SQL error when editing the reference of a supplier invoice that already exists
2016-04-29 17:01:01 +02:00
fmarcet
e96e0f637a
FIX: Not filtering correctly when come from dashboard
2016-04-28 10:41:37 +02:00
fmarcet
d599261d20
FIX: Not filtering correctly when come from dashboard
2016-04-28 10:38:50 +02:00
Alexis Algoud
1746f8f96c
FIX search on date into supplier invoice list dont work because of status -1
2016-04-25 11:25:49 +02:00
Marcos García de La Fuente
d98e50e661
Little change
2016-04-23 13:44:43 +02:00
Laurent Destailleur
3d4ddcb29e
Merge pull request #5065 from atm-maxime/fix_supplier_order_log
...
Fix log function was removed in 1b6fa8ec34
2016-04-22 19:45:36 +02:00
Laurent Destailleur
fb53b41078
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-22 19:20:04 +02:00
Laurent Destailleur
da14f247bb
Merge pull request #5070 from atm-maxime/fix_display_payment_on_invoices
...
Fix payment display on customer invoice and replicate on supplier inv…
2016-04-22 19:19:46 +02:00
Laurent Destailleur
bfc5be1aad
FIX Fix and move dolGetFirstLine function into main
...
FIX Hang on ->client not defined
2016-04-22 19:07:32 +02:00
Laurent Destailleur
1de36d6501
Merge pull request #5011 from altatof/supplierorder_noprice
...
NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED
2016-04-22 18:27:42 +02:00
Maxime Kohlhaas
fc7056650e
Fix payment display on customer invoice and replicate on supplier invoice
2016-04-22 10:42:06 +02:00
Maxime Kohlhaas
bea8b49d8c
Fix log function was removed in 1b6fa8ec34
2016-04-22 09:02:40 +02:00
Marcos García de La Fuente
e2c86d3fd8
NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead
2016-04-17 15:24:22 +02:00
Marcos García de La Fuente
aa64266c2f
FIX #5008 SQL error when editing the reference of a supplier invoice that already exists
...
Close #5008
2016-04-16 18:44:31 +02:00
Christophe Battarel
ec5e0e5290
forgot one line
2016-04-15 12:32:36 +02:00
Christophe Battarel
c3d4cd85f1
NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED allow supplier
...
order even if no supplier price defined
2016-04-15 12:28:35 +02:00
Laurent Destailleur
8d46d76f96
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/paiement.php
2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/fourn/facture/paiement.php
2016-04-12 15:03:19 +02:00
Laurent Destailleur
8342a61ea9
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/fourn/facture/card.php
htdocs/product/composition/card.php
2016-04-12 15:00:02 +02:00
Laurent Destailleur
357877b1fe
Debug multicurrency and clean properties of some modules
2016-04-12 14:45:59 +02:00
Laurent Destailleur
d0e3d9db76
Merge pull request #4992 from altatof/fix_minimum_buying_price
...
FIX: correct display of minimum buying price
2016-04-11 19:17:09 +02:00
Christophe Battarel
791df0c9ea
FIX: correct display of minimum buying price
2016-04-11 17:27:34 +02:00
Juanjo Menent
f25bf64257
Merge pull request #4978 from marcosgdf/bug-4851
...
FIX #4851 Project selector in supplier invoices shows the project label twice
2016-04-10 12:41:08 +02:00
Juanjo Menent
e27def479f
Merge pull request #4986 from marcosgdf/bug-4747
...
FIX #4747 Missing UI background when registering a supplier invoice payment
2016-04-10 11:54:27 +02:00
Juanjo Menent
be0b7c86ff
Merge pull request #4985 from marcosgdf/bug-4742
...
FIX #4742 Able to delete a supplier invoice with a registered payment
2016-04-10 11:52:21 +02:00
Marcos García de La Fuente
15d9273751
FIX #4747 Missing UI background when registering a supplier invoice payment
...
Close #4747
2016-04-10 00:30:31 +02:00
Marcos García de La Fuente
af473df214
FIX #4742 Able to delete a supplier invoice with a registered payment
...
Close #4742
2016-04-09 23:29:19 +02:00
Marcos García de La Fuente
865f9defff
FIX #4424 Missing email of user popup in supplier orders area
...
Close #4424
2016-04-09 23:08:47 +02:00
Marcos García de La Fuente
1026484da1
FIX #4748 Supplier invoice payment confirmation amount is not translated
...
Close #4748
2016-04-09 22:48:42 +02:00
Marcos García de La Fuente
b2f922291f
FIX #4851 Project selector in supplier invoices shows the project label twice
...
Close #4851
2016-04-09 22:38:58 +02:00
Laurent Destailleur
f8b39ab50e
Fix errors reported by scrutinizer
2016-04-09 19:04:23 +02:00
Laurent Destailleur
1b6fa8ec34
Clean dead code
2016-04-09 19:04:04 +02:00
Laurent Destailleur
27217ccccd
Maxi debug of supplier order workflow.
...
Add trigger ORDER_SUPPLIER_CLASSIFY_BILLED
Parameter user is added so it is defined into triggers.
2016-04-09 18:51:09 +02:00
Laurent Destailleur
c2fc9ecf68
Fix scrutinizer warning
2016-04-09 16:12:53 +02:00
Laurent Destailleur
3827a06796
Debug the supplier ref reputation feature.
2016-04-08 22:18:36 +02:00
Laurent Destailleur
448758bbf4
Merge branch 'develop_NEW_supplier_price_reputation' of
...
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_supplier_price_reputation
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-04-08 22:01:55 +02:00
Laurent Destailleur
b9ffc18c27
Uniformize log of supplier order. Now use the generic log feature.
2016-04-08 17:28:48 +02:00
Laurent Destailleur
04a85ff831
FIX Substitution key on email of supplier order was broken
2016-04-08 16:06:50 +02:00
Laurent Destailleur
b1c2198154
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/ajax/selectsearchbox.php
htdocs/core/lib/price.lib.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/modCommande.class.php
htdocs/core/modules/modFacture.class.php
htdocs/projet/list.php
htdocs/societe/list.php
2016-04-07 20:01:52 +02:00
Laurent Destailleur
086345490d
Generalize the set of trackid for everyemail sent by dolibarr.
2016-04-07 14:29:07 +02:00
Laurent Destailleur
1e6152eb53
FIX Missing a row when incoterm is on
2016-04-07 14:17:20 +02:00
Laurent Destailleur
7f129d14d7
Better responsive design
2016-04-07 14:08:38 +02:00
Alexis Algoud
61a077b0ee
NEW reputation for price supplier
2016-04-06 09:58:03 +02:00
fmarcet
d3794bb145
FIX: Not removing code into vatrate.
2016-04-05 16:49:50 +02:00
Laurent Destailleur
e1bec46a34
FIX The include file for action on files should not be a template file
...
but an action include file.
2016-04-02 14:16:16 +02:00
Laurent Destailleur
e40b678d7b
Uniformize code
2016-04-01 16:29:47 +02:00
Laurent Destailleur
97b5026ad8
Uniformize code and css
2016-04-01 16:18:45 +02:00
Laurent Destailleur
2d9c53fc26
NEW Merge all boxes "related objects" into one. This save a lot of room
...
on most card and avoid often horizontal scoll.
2016-03-30 19:18:31 +02:00
Laurent Destailleur
e79633fa8d
Fix search on supplier orders
2016-03-30 11:03:39 +02:00
Laurent Destailleur
abcbc5c0da
Fix limit management
2016-03-30 10:45:14 +02:00
Laurent Destailleur
bc1b2d048b
Uniformise option name
2016-03-25 18:09:42 +01:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d
Revert "Corrected non-static usages of Form::selectarray function"
...
This reverts commit 87cd6e1e40
2016-03-25 15:34:37 +01:00
Laurent Destailleur
8ecfca5a9e
Revert change that break compatiblity with 100% of modules
2016-03-25 15:26:46 +01:00
Laurent Destailleur
26de415b77
Revert commit that break compatibility of 100% of modules
2016-03-25 15:24:57 +01:00
Marcos García de La Fuente
89bd173c2f
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
ff6b187ef3
NEW Converted Form::showLinkedObjectBlock to a static function
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
4d78932fe8
NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
87cd6e1e40
Corrected non-static usages of Form::selectarray function
2016-03-20 14:15:17 +01:00
Laurent Destailleur
2d1c56cfaa
Merge pull request #4754 from defrance/patch-107
...
FIX : only enabled society is used for product select
2016-03-10 13:56:25 +01:00
Laurent Destailleur
09a29322c3
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/customer/list.php
htdocs/accountancy/supplier/list.php
htdocs/commande/orderstoinvoice.php
htdocs/public/demo/index.php
htdocs/societe/commerciaux.php
2016-03-08 17:40:21 +01:00
BENKE Charlie
e455a2c9a8
only enabled society is used for product select
2016-03-07 08:25:21 +01:00
Laurent Destailleur
d1777a6783
Replace function rand with mt_rand (prepare php 8)
2016-03-05 15:01:25 +01:00
Laurent Destailleur
446a080c75
NEW Mutualize code to manage email substitution variables. Show
...
available variables into page to edit email templates.
2016-03-05 12:20:58 +01:00
Laurent Destailleur
0f9afea1cc
Merge pull request #4731 from IonAgorria/unset-date-post
...
Fix: unset date start/end at success
2016-03-04 16:20:10 +01:00
Laurent Destailleur
f06911a8b0
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/langs/fr_FR/admin.lang
htdocs/societe/commerciaux.php
2016-03-04 15:39:55 +01:00
Laurent Destailleur
9ffaf9b218
Merge remote-tracking branch 'origin/3.7' into 3.8
2016-03-04 14:51:59 +01:00
Ion Agorria
a1159b6f29
Fix: unset date start/end at success
2016-03-04 14:11:06 +01:00
Maxime Kohlhaas
db656ea4ca
New : add button to create event on supplier order or invoice with MAIN_ADD_EVENT_ON_ELEMENT_CARD
2016-03-04 10:38:33 +01:00
Laurent Destailleur
3a58613e45
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
2016-03-02 23:40:11 +01:00
Laurent Destailleur
3b70bbb05a
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/lib/admin.lib.php
2016-03-02 23:07:42 +01:00
Marcos García de La Fuente
7d336bd5d4
FIX #4414 Supplier invoices use FAC_FORCE_DATE_VALIDATION client invoices property
...
Close #4414
2016-03-02 11:43:55 +01:00
Marcos García de La Fuente
123d6fb6e5
FIX #4425 Missing "VAT" translation in supplier order popup
...
Close #4425
2016-03-02 11:29:42 +01:00
Laurent Destailleur
a26f880843
Fix missing declarion of form
...
Fix by adding MAIN_USE_OLD_SEARCH_FORM to restore a way for backward
compatibility
Fix to have delay for payment term at least 1 day (to avoid immediate
warning after creation of an invoice)
2016-03-01 00:59:42 +01:00
fmarcet
77490bff71
FIX: Status filter don't work
2016-02-29 10:07:48 +01:00
Laurent Destailleur
5453f99e2e
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/comm/prospect/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
2016-02-27 18:33:39 +01:00
Laurent Destailleur
8807222f24
Fix a lot of fixes to have the french vat npr working better
2016-02-27 12:22:39 +01:00
Laurent Destailleur
c86a1a30d5
Fix a lot of fixes to have the french vat npr working better
2016-02-27 11:46:16 +01:00
aspangaro
c907cd139c
Lot of corrections
2016-02-27 08:15:58 +01:00
Bahfir Abbes
4cbc1539b9
Fix: displays error when the supplier price does not exist.
2016-02-26 22:48:01 +01:00
fmarcet
30d6aa0b96
FIX: Some filters are lost when paging
2016-02-26 13:14:23 +01:00
abb
5e2261c9bd
handle customer orders from supplier orders with id variable name correction
...
Conflicts:
htdocs/fourn/commande/card.php
2016-02-26 01:26:16 +01:00
Laurent Destailleur
ff9a82c96f
Merge pull request #4670 from atm-ph/new_add_multicurrency_supplier_invoice_payment
...
New add multicurrency supplier invoice payment
2016-02-22 16:26:31 +01:00
Laurent Destailleur
f6d1913bb7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2016-02-22 13:35:46 +01:00
Laurent Destailleur
e7e6957073
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-02-22 09:27:53 +01:00
phf
fd4cda819c
New add supplier payment
2016-02-21 22:47:52 +01:00
phf
ec0282a28e
New add multicurrency display on supplier payment
2016-02-21 13:26:48 +01:00
philippe grand
6f6f2a0574
enhance code help translation
2016-02-20 11:18:02 +01:00
phf
d320aebe82
Fix muticurrency attributs not declared in class PropalLine
...
Fix fetch_lines of FactureFournisseur with multicurrency fields
2016-02-19 22:41:47 +01:00
phf
b7d99271f8
New add multicurrency on supplier order
2016-02-19 22:25:59 +01:00
Laurent Destailleur
9c8d69eaa9
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2016-02-19 04:46:11 +01:00
Laurent Destailleur
cc524c8180
Fix bad picto
2016-02-19 04:41:29 +01:00
Laurent Destailleur
761ad0114c
Merge pull request #4641 from atm-ph/new_add_multicurrency_supplier_proposal_order
...
New add multicurrency on supplier proposal/order
2016-02-19 03:36:23 +01:00
Laurent Destailleur
7ba6754a55
Fix the missing button to record reception
2016-02-18 00:27:35 +01:00
phf
e24a35b904
New add multicurrency on supplier proposal/order
2016-02-16 23:58:21 +01:00
Laurent Destailleur
6b9d7763fe
Clean code for adding a link to a related object
2016-02-16 22:26:23 +01:00
philippe grand
03b9b65d93
[quality] : better help
2016-02-16 16:45:19 +01:00
Laurent Destailleur
e0a0817123
Merge pull request #4623 from IonAgorria/dynamic-price-changes
...
Dynamic price corretions/changes
2016-02-16 15:11:02 +01:00
Laurent Destailleur
71a12824c9
Merge branch 'new_numbering_module_supplier_payment' of
...
https://github.com/atm-ph/dolibarr into
atm-ph-new_numbering_module_supplier_payment
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-15 00:31:33 +01:00
Ion Agorria
89657d0439
Changed Price Parser functions and added testExpression
2016-02-14 17:28:31 +01:00
Ion Agorria
99efbd3464
Check if dynamic price is enabled
2016-02-14 16:09:47 +01:00
Laurent Destailleur
0e7739fa85
Merge pull request #4604 from IonAgorria/fix_productsupplierprice
...
Fix missing vars in fetch_product_fournisseur_price
2016-02-14 12:47:02 +01:00
Ion Agorria
1f99ce8ae9
Fix var typo
2016-02-14 01:21:56 +01:00
Laurent Destailleur
158906455a
NEW Can change dynamically number of records visible into lists.
2016-02-11 20:40:33 +01:00
Ion Agorria
1a45ab9d50
Fix missing vars in fetch_product_fournisseur_price
2016-02-11 20:29:45 +01:00
Laurent Destailleur
bc33b19d7d
NEW Can change dynamically number of records visible into lists.
2016-02-11 20:24:15 +01:00
Laurent Destailleur
5ea9c6dd83
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/core/class/html.formprojet.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/accountancy.lang
2016-02-09 14:40:25 +01:00
Laurent Destailleur
9da0164d90
Uniformize code for lists
2016-02-07 15:50:48 +01:00
Laurent Destailleur
efc2eeea83
Uniformize code for filters on payments
2016-02-07 14:41:06 +01:00
phf
d66bc6f1b3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_numbering_module_supplier_payment
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2016-02-06 12:57:30 +01:00
Laurent Destailleur
713050bd57
Fix style on payment page
2016-02-05 12:46:41 +01:00
phf
a8e480e392
FIX #3509 payment ref for suppliers
2016-02-04 23:15:06 +01:00
Laurent Destailleur
99b2236260
FIX Selection of project must no show closed project
2016-01-28 12:19:13 +01:00
Laurent Destailleur
df4cd3de17
FIX Selection of project must no show closed project
2016-01-28 12:05:14 +01:00
Laurent Destailleur
467dc12a7b
NEW Module "Supplier commercial proposal" (price request) is set to
...
stable status.
2016-01-25 12:33:38 +01:00
Laurent Destailleur
4df584e57b
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-01-23 11:51:56 +01:00
Laurent Destailleur
dbaa43f3be
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/holiday/card.php
htdocs/holiday/list.php
htdocs/user/card.php
2016-01-23 11:45:39 +01:00
Laurent Destailleur
dc438792f4
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/fourn/commande/card.php
2016-01-23 11:39:37 +01:00
Laurent Destailleur
93b2013aa7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/projet/tasks/list.php
2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/societe/index.php
2016-01-22 03:25:30 +01:00
Laurent Destailleur
34c648b351
FIX #4418
2016-01-22 03:04:07 +01:00
Laurent Destailleur
d2f5f5c01f
Merge pull request #4266 from fappels/develop_multi_warehouse
...
Add shipping and dispatching from/to multiple warehouses
2016-01-22 02:26:25 +01:00
Laurent Destailleur
8e882b4cc2
NEW Add warning on tasks when they are late (add also the warning
...
tolerance parameter)
2016-01-18 15:56:51 +01:00
Regis Houssin
6e30d5e516
Merge remote-tracking branch 'origin/3.7' into 3.7_bug
2016-01-15 13:16:40 +01:00
Regis Houssin
905f9d78ed
Fix: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9)
2016-01-15 13:12:19 +01:00
Laurent Destailleur
13f10d55fc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-01-13 20:42:32 +01:00
fappels
284722ef3c
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse
2016-01-13 16:41:34 +01:00
Laurent Destailleur
d396612a7c
NEW: Add a new method for margin calculation. Added margin on "cost
...
price" to margin on WAP price and margin on "best supplier price".
2016-01-13 12:48:59 +01:00
fappels
51b08f579b
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse
...
Fix Conflicts:
2016-01-12 13:56:00 +01:00
aspangaro
cf6be40922
New: #3292 Make sure each and every page displays a title
2016-01-11 22:03:26 +01:00
Frédéric FRANCE
0f5870fcf9
Update card.php
2016-01-09 10:42:03 +01:00
Laurent Destailleur
cbe65fbc79
Fix: fields added into 3.8 to store email event was not enough. To late
...
to use them. Will be done into 4.0
2016-01-08 13:05:56 +01:00
Laurent Destailleur
a974fa858d
Merge pull request #4328 from frederic34/patch-8
...
Indentation
2016-01-06 18:51:55 +01:00
Laurent Destailleur
d6c5a73264
Fix missing payment fields definition in export
2016-01-06 17:37:01 +01:00
Laurent Destailleur
abe3f192fa
Debug and fix when using dolibarr with jmobile
2016-01-03 16:23:23 +01:00
Frédéric FRANCE
998649d467
Indentation
2016-01-02 18:51:31 +01:00
Laurent Destailleur
0314b3b5b1
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
2016-01-02 12:27:08 +01:00
Laurent Destailleur
52cd5d505e
Fix several bugs on css, translation or look
2016-01-01 23:44:23 +01:00
phf
fffc8a430d
FIX call trigger LINEBILL_SUPPLIER_CREATE
2015-12-31 15:48:16 +01:00
Sof
c04eef35d5
FIX: Field cost_price does not exist and typos
2015-12-28 19:07:25 +01:00
Laurent Destailleur
6f474c403c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/societe/notify/card.php
htdocs/societe/price.php
2015-12-27 19:15:20 +01:00
Laurent Destailleur
e536e10269
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
build/makepack-howto.txt
htdocs/filefunc.inc.php
2015-12-27 19:06:31 +01:00
Marcos García de La Fuente
ebdaf7dfa6
FIX #3980 Search field in "product by supplier" list sends empty result 3.8 and 3.7
2015-12-27 15:12:02 +01:00
Laurent Destailleur
18fdb75c98
Missing global
2015-12-23 20:02:15 +01:00
Laurent Destailleur
559e621fd2
Fix conflict with trigger to delete payment customer and supplier.
2015-12-23 19:54:56 +01:00
Laurent Destailleur
db7a98f0ef
Fix: When a payment mode was disabled, it was not visible on old
...
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
Laurent Destailleur
f0802eb36b
FIX #4245 PHP 7
2015-12-19 19:48:36 +01:00
Laurent Destailleur
3517b64031
FIX #4228 PHP7 error
2015-12-19 18:18:24 +01:00
Laurent Destailleur
f25a9030eb
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
.travis.yml
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
htdocs/includes/adodbtime/adodb-time.inc.php
htdocs/langs/en_US/accountancy.lang
2015-12-18 22:12:03 +01:00
fappels
7fc8007571
New add shipping and dispatching from/to multiple warehouses
...
Add select2 to warehouse selectors
Ship customer orderline from multiple warehouses
Dispatch client orderline to multiple warehouses
2015-12-18 18:00:31 +01:00
Sof
011f0fbb0b
FIX : Typo error
2015-12-15 14:04:52 +01:00
Laurent Destailleur
84ee18a11b
Fix bad management of second level approvement
2015-12-14 10:33:18 +01:00
philippe grand
2cd49043a6
[Qual] Close database handler should be after Footer
2015-12-11 19:37:12 +01:00
philippe grand
fc8c12d6f6
[Qual] Uniformize code
2015-12-10 16:14:37 +01:00
Laurent Destailleur
3bcdc5c9c0
Merge pull request #4181 from grandoc/develop
...
[Qual] Uniformize code
2015-12-10 13:35:44 +01:00
Laurent Destailleur
c497a5e526
Merge pull request #4171 from IonAgorria/fix-dateranges
...
Fix date handling for hours/mins in some pages
2015-12-10 13:08:30 +01:00
philippe grand
01c6728aa9
[Qual] Uniformize code
2015-12-08 11:35:08 +01:00
Ion Agorria
1dc5854535
Fix date handling for hours/mins in some pages
2015-12-07 03:59:03 +01:00
Laurent Léonard
7e31c8f38f
Fix decimals in payments of supplier invoices
2015-12-07 01:27:08 +01:00
Laurent Destailleur
055e650adf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-02 23:23:38 +01:00
Laurent Destailleur
574b270da0
Work on the "mass action" feature. Can run mass action on
...
result of a select.
2015-12-02 22:00:39 +01:00
Laurent Destailleur
de730c9762
NEW Introduce cost price on product.
2015-11-30 21:20:45 +01:00
Laurent Destailleur
c55d11869b
Billing of supplier or customer order is a process that can be done in
...
parallel with shipment or reception, so we show the status on another
field into lists.
2015-11-29 15:54:32 +01:00
Laurent Destailleur
b0e938fab4
Fix missing td cell
2015-11-29 13:15:02 +01:00
Laurent Destailleur
5df193ec93
Uniformize code
2015-11-28 20:25:50 +01:00
Laurent Destailleur
88e76dcf64
Fix utf8 encoded twice
2015-11-28 14:40:23 +01:00
Laurent Destailleur
b47dbc7a5f
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/install/pgsql/functions/functions.sql
htdocs/projet/element.php
2015-11-26 01:32:21 +01:00
Marcos García
a30f7d543a
Corrected fix
2015-11-25 10:19:11 +01:00
Laurent Destailleur
2a345b6fc0
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/admin/company.php
htdocs/admin/menus/edit.php
htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
2015-11-21 12:48:41 +01:00
Marcos García de La Fuente
e8fc5f0d3a
FIX #3987 Undefined variable $newref in CommandeFournisseur::approve
2015-11-21 11:00:56 +01:00
Laurent Destailleur
835700bb25
Merge pull request #4006 from marcosgdf/bug-3989
...
FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl
2015-11-16 23:42:38 +01:00
Laurent Destailleur
04ffe1c7f0
Merge pull request #4005 from marcosgdf/bug-3988
...
FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline
2015-11-16 23:42:04 +01:00
Alexis Algoud
55b23c4918
FIX add billed field in supplier order
2015-11-16 14:55:46 +01:00
Marcos García de La Fuente
53fb085766
Corrected indent
2015-11-16 13:29:37 +01:00
Marcos García de La Fuente
ec7e4cb3d4
FIX #3989 Undefined variable $conf in CommandeFournisseur::getNomUrl
2015-11-16 13:25:00 +01:00
Marcos García de La Fuente
0880b13142
FIX #3988 Undefined variable $conf and $error in CommandeFournisseur::addline
2015-11-16 13:24:11 +01:00
Marcos García de La Fuente
be460b6cbf
FIX #3992 CommandeFournisseur::ref is marked as deprecated and it shouldn't be
2015-11-16 13:20:56 +01:00
Laurent Destailleur
6bd6be0912
Debug and rename experimental module "supplier proposal". Still work to
...
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
2015-11-15 19:23:39 +01:00
Laurent Destailleur
388748055a
Fix missing translation for VAT
2015-11-15 15:08:54 +01:00
Laurent Destailleur
01058be44c
NEW Introduce a "code" into fiels to describe vat. This will allow to
...
suggest different vat lines with same value with ability to
differentiate them.
2015-11-14 17:53:58 +01:00
Laurent Destailleur
ab177b43af
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/.gitignore
htdocs/comm/mailing/card.php
htdocs/commande/list.php
htdocs/compta/facture.php
htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +01:00
Laurent Destailleur
b2285ca5e0
Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default.
...
All emails sent from Dolibarr have a dedicated tracking id.
2015-11-12 21:25:01 +01:00
Laurent Destailleur
096ec3100d
Merge pull request #3926 from frederic34/fccard
...
allow chaining and remove header exit
2015-11-08 15:49:33 +01:00
Juanjo Menent
f15e83e918
Merge pull request #3937 from marcosgdf/bug-3877
...
FIX #3877 HTML encoded strings when searching for a supplier invoice
2015-11-08 11:19:49 +01:00
Laurent Destailleur
3906cb79c5
NEW: Add parameter to add a link to use "date of invoice" in one click
...
when fille a payment card.
2015-11-07 23:46:07 +01:00
Marcos García de La Fuente
ba42a7779f
FIX #3877 HTML encoded strings when searching for a supplier invoice
...
Close #3877
2015-11-07 14:34:26 +01:00
frederic34
7349862b64
translations
2015-11-07 11:19:31 +01:00
frederic34
a597d6c379
allow chaining
2015-11-07 10:23:56 +01:00
frederic34
becce332dd
allow chaining and remove header exit
2015-11-07 09:52:00 +01:00
Laurent Destailleur
4bb21fd218
Merge pull request #3884 from FHenry/3.8
...
FIX #3880
2015-11-05 02:32:32 +01:00
Laurent Destailleur
e26940ddf7
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/install/filelist.xml
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
htdocs/societe/price.php
2015-11-05 01:50:30 +01:00
Laurent Destailleur
77371af35a
FIX #3661 Margin is not selected correctly when adding a product
2015-11-05 01:08:30 +01:00
Florian HENRY
876ab4bb59
FIX : #3882
2015-11-04 18:30:09 +01:00
Florian HENRY
d4ee183662
FIX : 3880
2015-11-04 18:21:59 +01:00
Laurent Destailleur
df4f09e72f
FIX #3240
2015-11-03 14:02:36 +01:00
Laurent Destailleur
da0aa2f937
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/langs/en_US/main.lang
htdocs/product/list.php
htdocs/product/stock/mouvement.php
2015-11-02 19:31:42 +01:00
Laurent Destailleur
d8796e4cc7
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/product/stats/commande.php
htdocs/product/stats/commande_fournisseur.php
htdocs/product/stats/facture.php
htdocs/product/stats/facture_fournisseur.php
htdocs/product/stats/propal.php
2015-11-02 19:25:51 +01:00
Laurent Destailleur
a9ddcc1a80
Merge pull request #3832 from frederic34/patch-16
...
NEW Add supplier order to the Direct Printing System
2015-11-02 11:27:00 +01:00
Laurent Destailleur
72915aa16d
Merge pull request #3784 from All-3kcis/develop-patch-11
...
NEW Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE"
2015-11-02 11:23:49 +01:00
All-3kcis
a658ff7e90
add commit or rollback if error
2015-11-02 10:26:07 +01:00
Laurent Destailleur
2c682022cf
NEW The search box and the bookmarks are now rendered by the menu
...
manager.
2015-10-30 09:36:57 +01:00
Laurent Destailleur
6cc3df7e71
NEW Quick searh filter works on invoice, proposal, order, intervention,
...
contract
2015-10-30 08:35:56 +01:00
Frédéric FRANCE
ff9648eed9
Update card.php
2015-10-29 19:09:37 +01:00
fmarcet
310ecb1e09
FIX: Show product image on getNomUrl()
2015-10-29 12:28:28 +01:00
atm-robin
29b8919a40
FIX supplier rights for orderToInvoice
2015-10-26 14:34:46 +01:00
Laurent Destailleur
1f1e72f2b6
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/main.inc.php
2015-10-25 19:54:41 +01:00
Maxime Kohlhaas
ef2337a338
Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8
...
Conflicts:
htdocs/compta/facture/list.php
2015-10-22 14:41:58 +02:00
All-3kcis
00c2b1a32a
move db->begin() before trigger
2015-10-22 14:30:11 +02:00
All-3kcis
ceae04b76e
move trigger before query
2015-10-22 12:03:01 +02:00
Laurent Destailleur
f312ee58de
Merge pull request #3779 from All-3kcis/develop-patch-10
...
Correct return value
2015-10-22 10:35:55 +02:00
Laurent Destailleur
474692e71a
Remove duplicate page fourn/list.php
2015-10-22 09:48:16 +02:00
Frédéric FRANCE
4689b0cc11
Update fournisseur.commande.class.php
2015-10-21 17:31:51 +02:00
All-3kcis
ca8c1adf55
Add trigger "SUPPLIER_PRODUCT_BUYPRICE_DELETE" for frounisseur.product remove_product_fournisseur_price()
2015-10-21 10:07:53 +02:00
All-3kcis
3cb2637f25
Correct return value
2015-10-20 09:42:02 +02:00
Laurent Destailleur
22979523db
Try a fix for #3742
2015-10-20 02:34:53 +02:00
Maxime Kohlhaas
572be23fc1
FIX : filters on supplier invoices list are not used, search_status instead
2015-10-19 15:57:23 +02:00
Laurent Destailleur
9ad998d0be
Add comments
2015-10-18 21:51:09 +02:00
Laurent Destailleur
a90c5ce962
Revert "Add currently used sortfields and sortorder"
...
This reverts commit 0663932589
2015-10-18 21:48:17 +02:00
Laurent Destailleur
81580f75b9
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture.php
2015-10-18 21:22:42 +02:00
Juanjo Menent
1f05cb844c
Merge pull request #3755 from grandoc/develop
...
[Qual] Uniformize code
2015-10-18 12:35:17 +02:00
Juanjo Menent
02c1f37a95
Merge pull request #3747 from fappels/develop-best-pmp-pos-margin
...
Qual getSupplierPrices
2015-10-18 12:10:29 +02:00
philippe grand
1762b3aaa7
[Qual] Uniformize code
2015-10-17 17:09:34 +02:00
Laurent Destailleur
3d94e3d80e
FIX Editing a supplier price should keep the vat.
2015-10-17 12:01:17 +02:00
Frédéric FRANCE
d68db2a844
Update fournisseur.commande.class.php
2015-10-17 08:48:53 +02:00
Laurent Destailleur
3ce147ccc1
Use new architecture for quick search for the account area.
2015-10-17 02:41:09 +02:00
Laurent Destailleur
2122d4d43a
NEW Contract module can be used to follow both sold and bought
...
contracts/recurring subscriptions.
2015-10-17 00:52:35 +02:00
fappels
0663932589
Add currently used sortfields and sortorder
2015-10-16 12:51:49 +02:00
Laurent Destailleur
b3491ef4e5
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/admin/facture_cust_extrafields.php
htdocs/compta/facture/admin/facturedet_cust_extrafields.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
fappels
74c373a3af
Qual getSupplierPrices
...
use productfourn method list_product_fournisseur_price because query has
same purpose.
2015-10-15 22:54:42 +02:00
Laurent Destailleur
a84ec64ece
The new banner tab is available on all tabs of thirdparty.
2015-10-13 13:06:32 +02:00
Laurent Destailleur
80bd563fde
Use GETPOST
2015-10-11 20:41:06 +02:00
Laurent Destailleur
61d739635e
Uniformize code and css for tables. Filters must be implemented
...
following example in test_arrays.php.
2015-10-09 12:30:16 +02:00
Laurent Destailleur
8d47a307bb
Better use of space
2015-10-06 21:52:42 +02:00
Laurent Destailleur
1f742c7464
FIX Add a test to save life when ref of object (invoice ref, order ref,
...
...) was empty. The was no way to go back to a clean situation, even
after vaidating again the object.
2015-10-06 16:38:27 +02:00
Laurent Destailleur
f54a1ca367
CSS enhancement
2015-10-06 01:03:31 +02:00
frederic34
1e8ff69267
Optioncss
2015-10-04 13:34:55 +02:00
frederic34
f2d7523091
Optioncss
2015-10-04 12:31:32 +02:00
frederic34
ed917ab447
Optioncss
2015-10-04 11:30:28 +02:00
frederic34
9a021e6de4
Optioncss not kept in list
2015-10-04 10:45:57 +02:00
Juanjo Menent
31230d296d
Merge remote-tracking branch 'upstream/3.8' into develop
2015-10-03 23:51:38 +02:00
Juanjo Menent
8f28e7cf1c
Merge remote-tracking branch 'upstream/3.8' into 3.8
2015-10-03 23:34:37 +02:00
Juanjo Menent
8febf25c23
Fix : #3566
2015-10-03 23:34:10 +02:00
Juanjo Menent
bc01d28061
Fix: formconfirm printing
2015-10-03 22:59:22 +02:00
philippe grand
e22fb3c538
fix : Typo
2015-10-02 12:39:09 +02:00
philippe grand
8a9c9f49d5
fix : Typo
2015-10-02 12:37:13 +02:00
Laurent Destailleur
62792c08eb
Merge pull request #3591 from GPCsolutions/inherited
...
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
Juanjo Menent
ad1a4c7e15
Merge pull request #3598 from GPCsolutions/formconfirm
...
[Qual] Replaced deprecated form_confirm()
2015-09-26 08:48:16 +02:00
Juanjo Menent
6999ad0a4f
Merge pull request #3587 from GPCsolutions/fiche_titre
...
[Qual] Replaced deprecated function calls.
2015-09-26 08:39:22 +02:00
Raphaël Doursenaud
485c369d55
[Qual] Replaced deprecated form_confirm()
2015-09-24 21:10:35 +02:00
Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
631ee83745
[Qual] Replaced deprecated print_fiche_titre()
2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529
[Qual] Replaced deprecated print_titre()
2015-09-24 18:27:13 +02:00
Raphaël Doursenaud
9f2545b95d
[Qual] Replaced deprecated dol_clone by native clone
2015-09-24 17:24:40 +02:00
Laurent Destailleur
f81df66564
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/.gitignore
htdocs/categories/edit.php
2015-09-23 00:34:57 +02:00
Laurent Destailleur
077c696c09
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/.gitignore
htdocs/theme/.gitignore
2015-09-22 16:28:34 +02:00
Laurent Destailleur
da6a1d6629
NEW Introduce a method getDefaultCreateValueForField for developers to
...
get a default value to use for a form in create mode.
Implement it for public and private notes.
2015-09-22 13:55:31 +02:00
Laurent Destailleur
9cbd236c8c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/filefunc.inc.php
2015-09-16 22:09:21 +02:00
Laurent Destailleur
e36928fd65
FIX #3529
2015-09-16 21:23:52 +02:00
Florian HENRY
8fd9d2a7ce
FIX : #3530
2015-09-16 10:21:32 +02:00
Laurent Destailleur
b94fb9e1f3
Merge remote-tracking branch 'origin/3.8' into develop
2015-09-12 18:22:10 +02:00
Laurent Destailleur
db3c544e21
Fix #3240 [Supplier orders] Dashboard links to unuseful page
2015-09-12 18:14:08 +02:00
Laurent Destailleur
94723a9b83
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/langs/en_US/accountancy.lang
2015-09-12 15:23:02 +02:00
Laurent Destailleur
1966d75ced
FIX #3490
2015-09-12 12:50:55 +02:00
Laurent Destailleur
db1d9d6d8e
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/fourn/commande/dispatch.php
2015-09-12 11:50:46 +02:00
Laurent Destailleur
36632593c0
Fix SQL injections #3300
2015-09-12 11:36:19 +02:00
Laurent Destailleur
5bc74ad6ea
Fix SQL injections #3300
2015-09-12 11:23:44 +02:00
Laurent Destailleur
a83b3ae7e8
Merge pull request #3503 from fappels/3.7-dispatch-rounding
...
Fix #3471 3.7 Rounding issue when dispatching non-integer
2015-09-12 11:07:16 +02:00
fappels
75a14e02d8
Fix #3471 3.7 Rounding issue when dispatching non-integer
2015-09-10 23:29:13 +02:00
fappels
a294700cef
fix dispatch rounding version 1
2015-09-10 22:16:03 +02:00
Florian HENRY
a49f88c259
reveiw thirdparty list and add column and filter on country and typeent
2015-09-10 11:55:05 +02:00
Marcos García de La Fuente
c58b5a5117
Created CommandeFournisseur::hasDelay function
2015-09-06 19:23:46 +02:00
Marcos García de La Fuente
9ce8024f1e
Merge remote-tracking branch 'upstream/develop' into refactor
2015-09-06 18:57:38 +02:00
Marcos García de La Fuente
47e62f2270
Created FactureFournisseur::hasDelay function
2015-09-06 18:47:26 +02:00
Laurent Destailleur
5fd6c44640
Fix error management
2015-08-31 13:00:24 +02:00
Aurélien Stride
1a3d8b5ae4
FIX : adjusted test for affecting supplier reference
2015-08-31 09:25:39 +02:00
Laurent Destailleur
3315978fd3
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-30 21:22:28 +02:00
Aurélien Stride
e2072999cf
ADD : ref_supplier to object property, otherwise not visibly updated on change
2015-08-28 17:12:27 +02:00
Raphaël Doursenaud
cea47f3e25
Added tags/categories management to suppliers
...
Suppliers part of #2571
2015-08-26 19:30:55 +02:00
Laurent Destailleur
8061ec9084
Fix translation
2015-08-24 15:59:17 +02:00
Laurent Destailleur
9a6e13d253
Fix test if empty was inverted
2015-08-19 19:45:24 +02:00
philippe grand
53a21019fd
the form should be outside table to avoid errors
2015-08-15 16:15:54 +02:00
philippe grand
924ff21268
the form should be outside table to avoid errors
2015-08-15 16:12:33 +02:00
Laurent Destailleur
52240eec9a
Fix removed warnings
2015-08-15 02:44:05 +02:00
Laurent Destailleur
f9a7a49e78
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-07-31 11:06:54 +02:00
Laurent Destailleur
9569431f44
Fix ident
2015-07-31 11:06:25 +02:00
Laurent Destailleur
fcc6ce8c31
Fix Option for second level approbation was visible when it should
...
not.
2015-07-29 15:39:34 +02:00
Laurent Destailleur
5ca6593a57
Fix serious deadlock feature. It was possible to link with no way to
...
unlink. What if user make a bad click ? I complete feature with
reverse action to be sure to not have users with a corrupted situation.
2015-07-28 14:13:16 +02:00
Laurent Destailleur
72e7558356
Fix bad closing td
...
Fix missing value into list of time spent
Fix typo error into constant PROJECT_TIMES_SPENT_FORMAT
Fix sql error when updating time spent into updateTimeSpent
Fix supplier orders not visible into link to
2015-07-28 12:49:29 +02:00
Laurent Destailleur
38d30b5590
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/fourn/facture/card.php
2015-07-21 00:17:11 +02:00
Marcos García de La Fuente
b64adcc065
FIX [ bug 1925 ] "Link to order" option in supplier invoices is not working properly
...
Patch submitted by Philippe (pheno) at https://doliforge.org/tracker/?func=detail&aid=1925&group_id=144
2015-07-19 15:13:27 +02:00
Laurent Destailleur
581b6d0001
Fix: missing status on contacts
2015-07-14 11:51:27 +02:00
Laurent Destailleur
1fb40565f4
Fix bad parameters of function select_date
2015-07-12 12:50:24 +02:00
Marcos García de La Fuente
670596685f
Created function SupplierInvoiceLine::update and added missing localtax1_type and localtax2_type properties
...
Related to #2670
2015-07-05 13:34:06 +02:00
aspangaro
56831ecd16
Correct travis
2015-07-04 16:13:44 +02:00
Laurent Destailleur
ab01c40978
Merge pull request #3143 from marcosgdf/more-oop
...
Created function SupplierInvoiceLine::fetch and SupplierInvoiceLine::delete
2015-07-04 04:44:46 +02:00
Laurent Destailleur
7ad4d9056d
Merge pull request #3117 from All-3kcis/patch-2
...
Correct display of hours and minutes after action "Order"
2015-07-04 04:14:12 +02:00
Laurent Destailleur
bddee5d01f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-07-04 04:11:30 +02:00
Laurent Destailleur
5fafb08f91
Uniformize code
2015-07-04 04:11:16 +02:00
Laurent Destailleur
55dbc2dfe2
Merge pull request #3115 from sebhm/develop
...
add hook addMoreActionsButtons
2015-07-04 03:43:08 +02:00
Marcos García de La Fuente
9415bdd828
Created function SupplierInvoiceLine::fetch and SupplierInvoiceLine::delete
2015-07-03 19:17:45 +02:00
Laurent Destailleur
4a1dfa60a5
Uniformize code
2015-06-30 13:14:19 +02:00
All-3kcis
89c870225c
Correct display of hours and minutes after action "Order" in supplier order.
2015-06-30 10:49:15 +02:00
Laurent Destailleur
ae5b779652
Uniformize code
2015-06-30 01:34:17 +02:00
sebhm
84e51eff3c
add hook addMoreActionsButtons
...
as in most Card, this hook is useful
2015-06-29 22:36:41 +02:00
Laurent Destailleur
dc050d39eb
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/adherents/type.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/js/lib_batch.js
htdocs/core/modules/modUser.class.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/societe/consumption.php
htdocs/user/info.php
htdocs/user/note.php
htdocs/user/param_ihm.php
htdocs/user/perms.php
2015-06-29 00:09:28 +02:00
Juanjo Menent
0f046776d5
FIX #3091 TotalHT amount in supplier order is bold unlike the rest of
...
Dolibarr
2015-06-26 17:54:34 +02:00
aspangaro
f9831f908e
Use print_liste_field_titre();
2015-06-26 06:49:43 +02:00
aspangaro
9d2e964b00
Fix: print_liste_field_titre('');
2015-06-26 06:23:29 +02:00
Laurent Destailleur
5a8e763099
Uniformize code for hooks
...
Uniformize page name societe.php into list.php
2015-06-22 15:48:48 +02:00
Alexis Algoud
21f0fc8229
FIX can receive new batch product on supplier order
2015-06-18 19:49:19 +02:00
BENKE Charlie
94341e83ed
added ref supplier bill
...
more useful to match supplier bill than internal ref
2015-06-16 15:22:13 +02:00
Laurent Destailleur
fb1a3f3ea3
Rename alternative name
2015-06-16 12:04:11 +02:00
Laurent Destailleur
8b4e3096a6
Merge pull request #2412 from marcosgdf/commercial-name
...
NEW [ task #851 ] Add a new field: Commercial name
2015-06-16 11:44:03 +02:00
jfefe
745f0f7d7e
Fix crlf
2015-06-15 14:24:24 +02:00
Marcos García de La Fuente
a496606826
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/soc.php
2015-06-13 02:45:42 +02:00
Juanjo Menent
0596be1656
Merge pull request #3008 from hregis/develop_strict
...
Fix: ereg more simple
2015-06-12 21:24:13 +02:00
fmarcet
42b04102ba
New: Add due date filter on invoices lists
2015-06-11 12:40:16 +02:00
Regis Houssin
e3d1614004
Fix: ereg more simple
2015-06-11 09:21:44 +02:00
Laurent Destailleur
9b7982bf0c
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/card.php
htdocs/theme/eldy/style.css.php
2015-06-08 18:28:50 +02:00
Laurent Destailleur
02dbe16366
Mutualize code to show block to link an element to another one.
2015-06-06 15:57:59 +02:00
Regis Houssin
9a812a6c28
Fix: add filter for "dol_most_recent_files" for avoid conflict with
...
option "Save file on server with name "FA0700034-Original filename""
2015-06-06 13:03:02 +02:00
Laurent Destailleur
f42065146a
Start to clean html.form class.
2015-06-06 12:26:47 +02:00
Laurent Destailleur
43ed48896a
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/debian/changelog
htdocs/filefunc.inc.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2015-06-05 18:31:53 +02:00
Laurent Destailleur
1252a500ce
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/fourn/class/fournisseur.product.class.php
2015-06-05 16:50:46 +02:00
Laurent Destailleur
689d3e39f2
Merge pull request #2939 from FHenry/develop
...
NEW Add control another invoice supplier already exists for created from supplier order (as it is done on customer invoice)
2015-06-05 15:46:59 +02:00
Laurent Destailleur
3c8d54d55f
Merge pull request #2938 from FHenry/3.6
...
FIX : If supplier invoice block linked element is display after other block total HT amount is not reset to 0 and sum other block (like customer orders values)
2015-06-05 15:43:25 +02:00
Maxime Kohlhaas
f7493de50c
Fix : supplier order clone was buggy if notes contains apostrophe
2015-06-05 13:42:29 +02:00
jfefe
195a1b2708
FIX #2957 : missing $langs object for trigger
2015-06-04 18:10:29 +02:00
Florian HENRY
061e675b51
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-06-02 13:02:06 +02:00
Florian HENRY
3b3319e435
Add contrl invoice supplier already exists (as it is done on customer
...
invoice)
2015-06-02 13:01:51 +02:00
Florian HENRY
fb29fa486a
FIX : total amount in tpl linked object are not reset
2015-06-02 11:20:08 +02:00
Florian HENRY
3f1613197e
FIX : If supplier invoice block linked element is display after other
...
block total HT amount is not reset to 0 and sum other block (like
customer orders values)
2015-06-02 08:41:42 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Laurent Destailleur
a4164a6656
Merge pull request #2883 from bafbes/develop
...
Fix non existing "supplier invoice setting to draft" trigger
2015-05-25 18:49:57 +02:00
Marcos García de La Fuente
460a2ec2ab
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/categories/categorie.php
htdocs/comm/prospect/list.php
2015-05-25 15:09:46 +02:00
Raphaël Doursenaud
becc240b92
Include Categories class whenever Categorie::TYPE is used
2015-05-23 23:35:49 +02:00
Raphaël Doursenaud
ee808cdfd7
Added types constants to categories
2015-05-23 18:52:31 +02:00
abb
ebf2edf019
added new trigger for supplier invoice unvalidation "BILL_SUPPLIER_UNVALIDATE" in set_draft class function
2015-05-23 15:35:19 +01:00
Laurent Destailleur
4319cd63a3
Working on finishing of look
2015-05-22 14:28:02 +02:00
Francis Appels
793f68dc96
Qual: Remove unused pages
...
Remove unused but maintained pages which contain errors and deadlinks.
2015-05-21 20:13:41 +02:00
Laurent Destailleur
03acb1a8c9
Uniformize way to report error after "buildoc" action.
2015-05-19 00:01:30 +02:00
Laurent Destailleur
4a70bb7acf
Work on generic usage of get_exdir.
2015-05-18 23:04:49 +02:00
Laurent Destailleur
a258370f8a
Prepare code for generic solution where all path are forged using
...
get_exdir.
2015-05-18 22:25:51 +02:00
Francis Appels
28e973331b
Fix: update supplier orderline + rm deprecated prop
...
- Fix SQL error in update supplier orderline
- Remove deprecated $libelle from product class, $libelle is removed
from code and can not be used anymore, no sense to mark deprecated.
- Add missing translation key
2015-05-18 18:42:14 +02:00
Florian HENRY
4bc2d55cb3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-15 17:37:31 +02:00
Marcos García de La Fuente
e2b2c1c8bd
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/class/societe.class.php
2015-05-15 12:30:03 +02:00
Marcos García de La Fuente
457918c0f7
Merge remote-tracking branch 'upstream/develop' into commercial-name
2015-05-15 11:17:21 +02:00
Laurent Destailleur
c33cbefad2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-15 11:16:29 +02:00
Laurent Destailleur
bf883e1576
Minor cosmetic changes
...
Fix permissions and CRLF
2015-05-15 02:34:57 +02:00
Juanjo Menent
e3e6cff713
Merge pull request #2815 from bafbes/patch-4
...
Fix forgotten last contributor information to list.php Update
2015-05-13 21:16:16 +02:00
Laurent Destailleur
5937cd7f70
NEW Forms are using the tab look, even in creation mode.
2015-05-13 17:53:25 +02:00
Florian HENRY
8e61a03b5c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-12 21:02:36 +02:00
Raphaël Doursenaud
0d8641a073
[Qual] Use jQuery property instead of attribute to test and set checked
2015-05-12 14:51:30 +02:00
Bahfir Abbes
95a2e65d86
Update list.php
...
Fix forgotten last contributor information
2015-05-12 09:01:15 +01:00
Laurent Destailleur
83e4fe5d95
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/fourn/facture/list.php
2015-05-12 00:09:03 +02:00
Bahfir Abbes
280c6a04af
Update list.php
...
Correct erroneous links to supplier invoice documents in list
2015-05-11 18:03:26 +01:00
Laurent Destailleur
1714b8bdbe
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-05-10 23:44:02 +02:00
Laurent Destailleur
8b596d7a69
Fix css missing
2015-05-10 23:43:18 +02:00
Marcos García de La Fuente
ce7ed70d74
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/prospect/list.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
2015-05-10 12:23:07 +02:00
Juanjo Menent
577c872aaf
Code fixes
2015-05-07 20:44:31 +02:00
Raphaël Doursenaud
b8d9c20731
[Qual] Fixed HTML input form disabled attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9
[Qual] Fixed HTML input form checked attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +02:00
jfefe
7e0357dcf9
FIX : remove deprecated property 'libelle' on product object
2015-05-04 03:03:24 +02:00
Raphaël Doursenaud
7b538d8842
Fix missing unit parameter
...
Prevented the input of supplier invoices lines from working
2015-04-30 15:59:20 +02:00
Laurent Destailleur
576cd57a94
NEW Can edit internal label of invoice even when closed (this is a
...
private information)
2015-04-24 10:59:18 +02:00
Laurent Destailleur
96a33bbe8a
First clean of code after devcamp
2015-04-21 15:49:58 +02:00
Marcos García de La Fuente
7be7a770c1
Implemented units for CommandeFournisseur and FactureFournisseur
2015-04-19 16:46:24 +02:00
Marcos García de La Fuente
15b1f03a08
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/list.php
htdocs/comm/prospect/list.php
htdocs/societe/consumption.php
htdocs/societe/soc.php
2015-04-19 00:48:07 +02:00
Florian HENRY
41631ceed9
typo
2015-04-18 23:43:11 +02:00
Florian HENRY
f2018b7946
fix bug #2652
2015-04-18 22:59:20 +02:00
Marcos García de La Fuente
e2e6049c7f
Copyright
2015-04-18 20:50:03 +02:00
Marcos García de La Fuente
c07e26dcac
Merge branch 'develop' into fr-2613
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-04-18 20:42:57 +02:00
Marcos García de La Fuente
dc790ff586
NEW: Feature request: A page to merge two thirdparties into one #2613
2015-04-18 20:41:09 +02:00
Laurent Destailleur
8be83cd043
Merge branch 'develop' of https://github.com/fappels/dolibarr into fappels-develop
...
Conflicts:
htdocs/langs/en_US/sendings.lang
2015-04-18 20:29:25 +02:00
Maxime Kohlhaas
ecf1fbe5a7
Typo
2015-04-18 20:03:40 +02:00
Francis Appels
c5599efe62
Don't show 'undifined' when no max delivery time
2015-04-18 18:56:25 +02:00
Laurent Destailleur
873899a5d4
Merge pull request #2635 from FHenry/develop
...
fix typo
2015-04-18 17:45:25 +02:00
Florian HENRY
b7191a541c
All send email card works with model choice box
2015-04-18 17:15:36 +02:00
Laurent Destailleur
ce81f58986
Fix several bugs into edit of supplier lines
2015-04-18 16:54:00 +02:00
Marcos García de La Fuente
d6a2d972a6
Fix: [ bug #2601 ] Supplier orderstoinvoice does not work with PostgreSQL
2015-04-18 15:07:19 +02:00
Juanjo Menent
459737e171
Merge pull request #2625 from marcosgdf/bug-2601
...
Fix bug #2601 Supplier orderstoinvoice does not work with PostgreSQL
2015-04-18 15:03:01 +02:00
Marcos García de La Fuente
401c0584e5
Fix: [ bug #2598 ] Untranslated "Supplier" tab name and some tax inputs in /fourn/card.php
2015-04-18 14:59:19 +02:00
Juanjo Menent
d3f24dab0a
Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated
2015-04-18 13:36:47 +02:00
Juanjo Menent
dc74302985
Fix: Issues if strict mode option ONLY_FULL_GROUP_BY is activated
2015-04-18 11:32:01 +02:00
Marcos García de La Fuente
b5ed65f838
Fix: [ bug #2598 ] Untranslated "Supplier" tab name and some tax inputs in /fourn/card.php
2015-04-18 10:50:07 +02:00
Marcos García de La Fuente
9fee7a9827
Fix: [ bug #2601 ] Supplier orderstoinvoice does not work with PostgreSQL
2015-04-18 10:30:58 +02:00
Laurent Destailleur
d7ef1e7da0
The supplier code was not visible on supplier pdf.
2015-04-13 14:25:27 +02:00
Laurent Destailleur
5dc1102601
Fix object not defined
2015-04-13 13:34:13 +02:00
Laurent Destailleur
dbaaa44c76
Fix: link must not be visible if module disabled
2015-04-13 13:22:12 +02:00
Laurent Destailleur
56a14da5d4
FIXME that are not bug are replaced with TODO
...
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
2015-04-12 04:01:28 +02:00
Laurent Destailleur
d76c1a9f42
Can filter on serial number into movement list
2015-04-10 12:59:33 +02:00
Laurent Destailleur
787083028b
Fix: entered data are not lsot when error
2015-04-10 12:10:05 +02:00
Laurent Destailleur
530650b857
Make module productbatch stable
2015-04-10 11:59:41 +02:00
Laurent Destailleur
e01e0faeef
Can reopen to edit supplier order once ordered
2015-04-09 16:15:52 +02:00
Laurent Destailleur
ed6f2e9386
Fix error management
2015-04-09 15:14:50 +02:00
Laurent Destailleur
1bbecc0912
Restore link to stock for products.
2015-04-08 19:26:36 +02:00
Laurent Destailleur
fc803e7000
Fix permission lost when enabled/disabled module.
2015-04-08 17:33:38 +02:00
Laurent Destailleur
b3355df3bf
Fix delivery delay could not be set to unknown
2015-04-08 13:00:03 +02:00
Laurent Destailleur
1efa5bcabd
Fix: Avoid duplicate tooltip
2015-04-08 12:44:11 +02:00
Laurent Destailleur
94087f539f
Fix style
2015-04-08 11:50:40 +02:00
Laurent Destailleur
1d6a8a46f1
To clean an int we must use (int) and not trim()
2015-04-07 02:44:30 +02:00
Laurent Destailleur
02e8879d3b
NEW Feature to build a merged pdf with all unpaid invoice can work for
...
paid invoices.
2015-04-06 19:11:31 +02:00
Laurent Destailleur
b49705d5d0
Status and amount of object should always be visible.
2015-04-06 16:13:23 +02:00
Laurent Destailleur
e2508287bd
Merge pull request #2537 from marcosgdf/cq
...
Created Propal, FactureFourniseur, and Commande constants for status
2015-04-06 12:37:52 +02:00
Marcos García de La Fuente
50091dfe8b
Closes #2534 SQL error when editing a supplier invoice line
2015-04-04 17:44:52 +02:00
Laurent Destailleur
f38bf5a7d2
Fix extrafields were not saved when creating a supplier order
...
Fix removed hooks where we must use trigger
2015-04-03 11:00:52 +02:00
Marcos García de La Fuente
6fe803cd86
Created Propal, FactureFourniseur, and Commande constants for status
2015-04-03 05:18:47 +02:00
Laurent Destailleur
d71a3c52b4
Comments
2015-04-03 00:28:35 +02:00
Laurent Destailleur
e480177d9c
Fix error of triggers not reported to user
2015-04-02 18:44:02 +02:00
Laurent Destailleur
cf0f458a51
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
htdocs/langs/el_GR/projects.lang
htdocs/langs/en_GB/bills.lang
htdocs/langs/en_GB/main.lang
htdocs/langs/en_GB/orders.lang
htdocs/langs/es_AR/bills.lang
htdocs/langs/es_CO/admin.lang
htdocs/langs/es_CO/main.lang
htdocs/langs/es_ES/bills.lang
htdocs/langs/es_ES/projects.lang
htdocs/langs/fa_IR/categories.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/other.lang
htdocs/langs/fr_FR/projects.lang
htdocs/langs/lv_LV/bills.lang
htdocs/langs/nb_NO/bills.lang
htdocs/langs/pl_PL/bills.lang
htdocs/langs/pl_PL/mails.lang
htdocs/langs/pl_PL/projects.lang
htdocs/langs/ro_RO/bills.lang
htdocs/langs/ro_RO/products.lang
htdocs/langs/ro_RO/projects.lang
htdocs/langs/ru_RU/bills.lang
htdocs/langs/ru_RU/projects.lang
htdocs/langs/sl_SI/main.lang
htdocs/langs/tr_TR/bills.lang
htdocs/langs/tr_TR/projects.lang
htdocs/langs/vi_VN/bills.lang
2015-04-02 13:57:20 +02:00
Laurent Destailleur
d8db32a99c
NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2
...
approvals to make a supplier order approved. Activating this option
introduce a new permission to the second level approval.
2015-04-01 21:00:51 +02:00
Francis Appels
bba8b206a1
FIX: dispatch batch products
...
Fix dispatching batch products and add error message.
Make DispatchProduct method backwards comp and add missing $trigger.
Add missing ORDER_SUPPLIER_DISPATCH trigger to demo class.
2015-03-31 15:48:08 +02:00
Laurent Destailleur
2d50cc92b9
Differentiate title for customer and supplier orders/invoices.
2015-03-31 11:32:47 +02:00
Marcos García de La Fuente
8b8171c700
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/card.php
2015-03-30 03:25:57 +02:00
Laurent Destailleur
73b2e0bd01
Merge pull request #2471 from marcosgdf/refactor
...
refactor
2015-03-29 16:17:36 +02:00
Marcos García de La Fuente
b83ef4c1ec
Merge branch 'develop' into minor
2015-03-26 10:58:35 +01:00
Marcos García de La Fuente
50a3563f03
Minor correction to the product list of a supplier
2015-03-26 10:57:13 +01:00
Laurent Destailleur
dd3a6edf4e
Merge pull request #2473 from marcosgdf/invoicesmenu
...
NEW: Implemented statuses submenu for List menu of supplier and customer invoices.
2015-03-23 23:27:29 +01:00
Laurent Destailleur
6f22243104
Add option SUPPLIER_ORDER_NO_DIRECT_APPROVE
2015-03-23 15:25:21 +01:00
Laurent Destailleur
1a59b7b447
Add option SUPPLIER_ORDER_NO_DIRECT_APPROVE
2015-03-23 15:23:44 +01:00
Laurent Destailleur
3844d4e6f7
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
htdocs/core/boxes/box_activity.php
htdocs/fourn/commande/card.php
htdocs/user/card.php
2015-03-23 15:16:37 +01:00
Laurent Destailleur
dc0d3504dd
Fix: Bad notification key
2015-03-23 14:52:47 +01:00
Laurent Destailleur
b9c3c074b1
Fix: a line was inserted when making update
...
Fix: missing message into notification admin page
2015-03-23 14:43:19 +01:00
Marcos García de La Fuente
c6ad35e001
Implemented statuses submenu for List menu of supplier and customer invoices.
...
Menu "Pending payment" has been moved to the "List" submenu.
2015-03-23 13:42:50 +01:00
Marcos García de La Fuente
3d50b41b8e
Reverted $rowid instead of $id property
2015-03-23 01:40:33 +01:00
Marcos García de La Fuente
4349f27299
Revert "Revert "Refactor 1""
2015-03-23 01:39:12 +01:00
Laurent Destailleur
221d44a4b8
br at wrong place
2015-03-22 18:54:12 +01:00
Laurent Destailleur
ed468f8f3f
Merge pull request #2466 from marcosgdf/implemented-supplier-prod-list
...
NEW: List of recent modified supplier product prices in Supplier card
2015-03-22 14:30:20 +01:00
Laurent Destailleur
2d90256640
Revert "Refactor 1"
2015-03-22 12:51:29 +01:00
Laurent Destailleur
a79a779b04
Merge pull request #2456 from marcosgdf/refactor-1
...
Refactor 1
2015-03-22 12:47:05 +01:00
Laurent Destailleur
55140afde4
Merge branch 'price-global-variables' of
...
https://github.com/IonAgorria/dolibarr into
IonAgorria-price-global-variables
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/dynamic_price/editor.php
2015-03-22 12:45:04 +01:00
Laurent Destailleur
a55af4387b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
.travis.yml
htdocs/core/class/notify.class.php
htdocs/product/stock/class/mouvementstock.class.php
test/phpunit/AllTests.php
test/phpunit/MouvementStockTest.php
2015-03-22 12:10:39 +01:00
Laurent Destailleur
9e0aa22a04
Merge pull request #2461 from tiaris/3.7_langs_error
...
Add global $langs to method, necessary for triggers to function
2015-03-20 20:43:16 +01:00
Marcos García de La Fuente
70f6c3fdbb
NEW: List of recent modified supplier product prices in Supplier card
2015-03-20 12:59:37 +01:00
Laurent Destailleur
d442ac328c
Fix: some replacement tags were missing
2015-03-19 12:34:03 +01:00
Laurent Destailleur
6ceda02eaa
NEW: Enhancement of module 'Notification by Email'. Show nb of
...
notifications set. Can set several emails. Can set a threshold on
amount for notifications. Add notification on supplier order validation.
2015-03-18 21:44:57 +01:00
Laurent Destailleur
cd2fc2f890
Hooks 'printLeftBlock' and 'formConfirm' are now compliant with hook
...
development rules. They are "addreplace" hooks, so you must return
content with"->resprints='mycontent'" and not with "return 'mycontent'"
2015-03-18 14:31:37 +01:00
Laurent Destailleur
bbef07ef3d
Finished prototype to use hook to add a column by a module.
2015-03-18 14:08:37 +01:00
Laurent Destailleur
426835781a
Fix hook usage
2015-03-18 12:03:47 +01:00
jean
9e9a8894ea
Add global $langs to method, necessary for triggers to function
...
correctly
2015-03-17 14:20:08 +01:00
Laurent Destailleur
daf853d040
Merge pull request #2455 from aspangaro/develop-ReviewER
...
QUAL: Traduce terms + remove <center>
2015-03-16 02:11:29 +01:00
Laurent Destailleur
79ca1fe147
Clean code.
2015-03-15 23:32:43 +01:00
Marcos García de La Fuente
b822a1e3ad
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/class/societe.class.php
2015-03-15 18:20:17 +01:00
Marcos García de La Fuente
086e439543
Merge branch 'develop' into refactor-1
...
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
2015-03-15 18:16:55 +01:00
Marcos García de La Fuente
efb9f7f4fd
Merge branch 'develop' into refactor-1
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/includes/tcpdi/fpdf_tpl.php
2015-03-15 18:07:30 +01:00
aspangaro
d69f066735
QUAL: Traduce terms + remove <center>
2015-03-15 14:04:07 +01:00
Ion Agorria
5f9b1fa029
Changes for applying new paths
2015-03-14 16:50:02 +01:00
Laurent Destailleur
2a09e34bdf
Uniformize etrafields visibility for thirdparties card
2015-03-14 13:05:28 +01:00
Laurent Destailleur
ba2c0a2651
Clean code of hooks.
...
Extrafield index on fk_object must be unique.
2015-03-13 20:27:54 +01:00
Laurent Destailleur
9b4f65587f
Fix option MAIN_HTML_TITLE
2015-03-13 13:27:24 +01:00
Laurent Destailleur
548e720ca2
Uniformize code
2015-03-10 19:31:04 +01:00
Laurent Destailleur
51b67704ee
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-10 13:46:44 +01:00
Laurent Destailleur
194260fc5b
NEW: Add search box for supplier order search.
2015-03-10 13:25:25 +01:00
Laurent Destailleur
88a29b7c9c
Add an advance permission to check/uncheck reception
2015-03-09 20:26:56 +01:00
Laurent Destailleur
3e48456359
Fix when no price defined, we must how nothing instead of 0
2015-03-08 02:13:47 +01:00
Laurent Destailleur
56b5bfd25b
NEW: Implement option SUPPLIER_ORDER_USE_DISPATCH_STATUS to add a status
...
into each dispathing line of supplier order to "verify" a
reception is ok. Status of order can be set to "total/done" only if line
is verified.
2015-03-08 02:08:26 +01:00
Laurent Destailleur
dd13e477b1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-03-07 19:07:21 +01:00
Laurent Destailleur
9e4e9a5411
NEW: Can search on customer order amount into customer order list.
2015-03-06 20:59:18 +01:00
Laurent Destailleur
a1567778ab
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/commande/card.php
2015-03-06 18:51:55 +01:00
Laurent Destailleur
e55a983c03
Fix td balance
2015-03-06 16:13:09 +01:00
Laurent Destailleur
a169b3348e
Fix show alays date fields for contract module.
...
Fix select of product were lost.
2015-03-06 14:36:22 +01:00
Laurent Destailleur
d119397129
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/societe/class/societe.class.php
2015-03-05 11:38:16 +01:00
Laurent Destailleur
6c1c1fd691
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/lib/agenda.lib.php
htdocs/fourn/paiement/fiche.php
2015-03-05 11:35:39 +01:00
Laurent Destailleur
7b7b5090c7
Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into
...
atm-ph-incoterm
Conflicts:
htdocs/comm/propal.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-04 23:03:29 +01:00
Laurent Destailleur
96de912661
NEW: Add module "Supplier commercial proposals" to requests
...
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/tpl/document_actions_post_headers.tpl.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-04 17:54:43 +01:00
Marcos García de La Fuente
f94f9d1e57
Removed $permtoedit variable
2015-03-04 11:19:45 +01:00
Marcos García de La Fuente
6ec8a38e4a
Removed duplicated code
2015-03-04 10:46:39 +01:00
Marcos García de La Fuente
a7741350fe
Revert unwanted change
2015-03-04 10:41:40 +01:00
Marcos García de La Fuente
54b6b199c7
Documented missing properties and removed redundant documentation
...
(cherry picked from commit 6124f6a)
2015-03-04 10:37:48 +01:00
Marcos García de La Fuente
e1982c54d9
Moved duplicated code to common class
2015-03-04 10:37:47 +01:00
Marcos García de La Fuente
f82df1e634
Refactorred supplier order to match with objectline templates
2015-03-04 10:37:47 +01:00
Marcos García de La Fuente
47a151f157
Created supplier invoice line
2015-03-04 10:37:46 +01:00
Marcos García de La Fuente
b84cf4afac
Renamed FactureFournisseurLine to SupplierInvoiceLine
2015-03-04 10:37:46 +01:00
Marcos García de La Fuente
c7919a8d08
Removed duplicated code
2015-03-04 10:37:45 +01:00
Marcos García de La Fuente
77605bce3e
[ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment
2015-03-02 13:33:31 +01:00
Laurent Destailleur
8a00109baf
Fix: Several bugs int replenishment feature.
2015-03-01 16:05:20 +01:00
Laurent Destailleur
560f1a43cd
Fix: Several bugs int replenishment feature.
2015-03-01 16:04:34 +01:00
Laurent Destailleur
1cdd77a671
Fix: use bad var
2015-02-28 18:18:41 +01:00
Laurent Destailleur
4d226885cb
Rewrite code for supplier order and invoice to use shared code of
...
customer supplier and invoice.
Work on extrafield for supplier order and invoice.
2015-02-28 18:10:31 +01:00
Marcos García de La Fuente
2ba795fcbc
NEW: [ task #851 ] Add a new field: Commercial name
2015-02-28 14:30:06 +01:00
Laurent Destailleur
8e26c71fa7
Rewrite code for supplier order and invoice to use shared code of
...
customer supplier and invoice.
Work on extrafield for supplier order and invoice.
2015-02-28 04:59:27 +01:00
Laurent Destailleur
ef14e4e7ed
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.product.class.php
2015-02-28 03:11:15 +01:00
Laurent Destailleur
5d1545ad1f
Work on supplier order and customer extrafields
...
Use templates to show/edit supplier order and invoice lines
2015-02-27 18:05:12 +01:00
Laurent Destailleur
8f378b4480
Fix no error returned when contact already exists
2015-02-26 15:52:14 +01:00
Laurent Destailleur
d6438a51ab
Add log to help track bug
2015-02-26 15:24:15 +01:00
Laurent Destailleur
4bde7e9f51
Fix: Missing error management
2015-02-26 14:25:30 +01:00
Laurent Destailleur
daabc113a5
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
README.md
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
2015-02-26 13:36:07 +01:00
Laurent Destailleur
41a74c62e2
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:03:17 +01:00
Laurent Destailleur
9842e816d0
Fix bad sql type
...
Fix no input outside tr-td
2015-02-24 11:24:15 +01:00
Laurent Destailleur
eb4eededbd
Add class to manage table commande_fournisseur_dispatch
2015-02-24 11:19:47 +01:00
Laurent Destailleur
bbc82e829b
Fix bad sql request
2015-02-23 23:28:55 +01:00
Laurent Destailleur
afa8e5c6d8
Merge remote-tracking branch 'origin/3.7' into develop
2015-02-23 19:50:51 +01:00
Laurent Destailleur
4128c86035
Fix: Filter on statut was lost
2015-02-23 19:31:42 +01:00
Laurent Destailleur
6d3834b3b9
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/index.php
htdocs/projet/class/project.class.php
test/phpunit/BankAccountTest.php
2015-02-23 14:59:24 +01:00
phf
127868899d
Merge branch 'develop' into incoterm
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-02-23 10:42:01 +01:00
phf
81130634d3
[CORE] intégration de incoterm sur les différentes class (#incoterm).
2015-02-23 09:16:14 +01:00
Laurent Destailleur
b04682db4c
Fix Edit of extrafield on supplier invoice or order was deleteing other
...
fields.
Fix Missing escapment
Fix new field delivery date was only into edit page
2015-02-22 17:41:02 +01:00
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Laurent Destailleur
774389940e
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/propal/list.php
htdocs/compta/bank/ligne.php
htdocs/compta/resultat/clientfourn.php
htdocs/compta/salaries/fiche.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/facture/paiement.php
2015-02-18 23:51:41 +01:00
Laurent Destailleur
316e5c2f19
Merge pull request #2358 from marcosgdf/board-refactor
...
Refactored dashboard indicator
2015-02-18 23:39:15 +01:00
Laurent Destailleur
d7dcf28c61
Merge branch '3.7' of https://github.com/atm-gauthier/dolibarr into
...
atm-gauthier-3.7
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2015-02-18 23:15:40 +01:00
Laurent Destailleur
fc415fc3c9
Fix: [ bug #1826 ] Supplier payment types are not translated in
...
fourn/facture/paiement.php
2015-02-18 22:44:42 +01:00
Laurent Destailleur
b6947dbe2c
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/modules/DolibarrModules.class.php
2015-02-18 22:04:26 +01:00
Laurent Destailleur
1e1543403b
New: Add option SUPPLIER_ORDER_AUTOADD_USER_CONTACT to automatically set
...
user approving as contact following supplier order.
2015-02-17 19:49:17 +01:00
Laurent Destailleur
ad67fe50a3
Correct management when delivery date is universal time format.
2015-02-17 17:21:41 +01:00
Marcos García de La Fuente
fa55c60c35
Renamed WorkBoardResponse to WorkboardResponse
2015-02-16 23:52:49 +01:00
Marcos García de La Fuente
d5fd20e911
Renamed BoardResponse to WorkBoardResponse
2015-02-15 15:10:51 +01:00
Marcos García de La Fuente
bab0163c44
Missing Copyright info
2015-02-15 15:07:24 +01:00
Marcos García de La Fuente
d1f73499e9
Refactored dashboard indicator
2015-02-15 15:01:28 +01:00
Gauthier
105e024c48
@param desc
2015-02-12 13:20:03 +01:00
Gauthier
be56f76743
FIX : Display error on dispatched quantity when we have several times same product in a supplier order
2015-02-12 12:56:21 +01:00
Laurent Destailleur
179cbbd187
Maxi debug and enhancement of module batch.
2015-02-11 22:54:06 +01:00
Laurent Destailleur
fb3cf4da1e
New: The comment of the stock movement when making a supplier order
...
receiving is also stored into the tracking dispatch table (not only into
stock movement table).
2015-02-11 15:03:33 +01:00
Laurent Destailleur
b9d2de99e1
Translation
2015-02-11 14:46:16 +01:00
Laurent Destailleur
621976317a
Fixed error management
2015-02-10 21:08:02 +01:00
phf
a1d2f426b8
[CORE] correction mineurs pour travis (#new_ask_price).
2015-02-09 10:17:28 +01:00
phf
34bc1dbc15
Merge branch 'develop' into new_ask_price
2015-02-09 09:07:50 +01:00
Laurent Destailleur
3f807a09b4
Doxygen
2015-02-08 00:39:51 +01:00
Laurent Destailleur
1776349a30
Merge pull request #2329 from atm-ph/deliverytime
...
NEW Deliverytime
2015-02-08 00:00:50 +01:00
Laurent Destailleur
011d39105d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/admin/export.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/datepicker.php
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/fourn/facture/card.php
2015-02-07 03:28:36 +01:00
phf
1d9a3e0ce2
[CORE] Fix : renommage d'une fonction (#deliverytime).
2015-02-06 16:39:54 +01:00
phf
12c7e52b7e
[CORE] Fix : rename de la variable "delai_livraison_jours" en "delivery_time_days" (#deliverytime).
2015-02-06 16:33:58 +01:00
Laurent Destailleur
35129f2192
Fix PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS option not correctly
...
supported.
Fix: No limit on ldap search on dolibarr side.
2015-02-06 16:33:33 +01:00
phf
35d41d6f7c
[CORE] Ajout d'un attribut (delai_livraison_jours) à l'objet ProductFournisseur, paramétrable lors d'un ajout/modification d'un prix fournisseur et s'affiche sur une commande fournisseur avec le plus grand délai parmis la liste des produits dans la commande (#deliverytime).
2015-02-06 16:07:22 +01:00
phf
8ace3ee77b
[CORE] FIX : la validation d'une demande de prix à "accéptée" ne créer plus d'entré si le prix ou la quantité est à 0.
...
FIX : la création d'une commande depuis une demande ne prend plus en compte les produits qui ont un prix ou quantité à 0. (#new_ask_price).
2015-02-06 10:17:10 +01:00
Laurent Destailleur
4c5fa7510c
Fix bad translation key
2015-02-05 12:06:20 +01:00
Laurent Destailleur
556c27f834
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/stock/mouvement.php
2015-02-04 15:15:50 +01:00
phf
296fae058c
[CORE] ajout de la liaison entre une demande de prix et une commande fournisseur (#new_ask_price).
2015-02-03 16:54:04 +01:00
phf
b9ac5bc9e0
[CORE] correction bug lors de l'appel d'une fonction addline() et mise en commentaire d'un traitement inutile puisqu'on est uniquement dans le cas du fonctionnement du module (#new_ask_price).
2015-02-03 15:26:14 +01:00
phf
1e71b01016
[CORE] ajout d'une fonction pour mettre à jour l'id de projet lors de la création d'une commande depuis la demande de prix (#new_ask_price).
2015-02-03 15:22:03 +01:00
Laurent Destailleur
9c087e27d0
Fix permissions
2015-02-02 13:45:55 +01:00
phf
0f7af613f1
[CORE] ajout du bouton "créer une demande de prix" sur la fiche fournisseur (#new_ask_price).
2015-02-02 10:24:42 +01:00
Laurent Destailleur
d66d4f53a5
Merge branch 'tooltip' of https://github.com/frederic34/dolibarr into
...
frederic34-tooltip
Conflicts:
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/product/index.php
2015-01-31 15:41:33 +01:00
Laurent Destailleur
1c7feb67ea
Merge branch 'dinamic-prices-product' of
...
https://github.com/IonAgorria/dolibarr into
IonAgorria-dinamic-prices-product
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/fournisseurs.php
2015-01-31 14:53:14 +01:00
frederic34
6a1865adb6
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/fourn/commande/list.php
2015-01-31 09:58:41 +01:00
Laurent Destailleur
d0cc56d616
Showing price without tax also.
2015-01-31 01:12:05 +01:00
Laurent Destailleur
74dafbe034
Fix missing class
2015-01-31 00:45:55 +01:00
Laurent Destailleur
03cc1bd039
Fixed bad sql error
2015-01-31 00:27:35 +01:00
Laurent Destailleur
a35bd9a3e4
Fixed bad sql request
2015-01-31 00:27:11 +01:00
Laurent Destailleur
2684b327e5
Fixed bad sql error
2015-01-31 00:23:10 +01:00
Laurent Destailleur
29d399ba79
Merge remote-tracking branch 'origin/3.7' into develop
2015-01-31 00:09:37 +01:00
Laurent Destailleur
0ea4a5db7d
Fixed: Error management on triggers
2015-01-31 00:08:45 +01:00
Laurent Destailleur
275e198041
New: Selection of project use the new select2 component.
2015-01-30 19:57:38 +01:00
phf
d2cd78884e
[CORE] ajout de code nécessaire pour le fonctionnement du module pour créer une code fournisseur depuis une demande validé et accépté (#new_ask_price).
2015-01-30 16:52:14 +01:00
frederic34
b850b7b448
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/langs/en_US/sendings.lang
2015-01-30 16:45:24 +01:00
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
Laurent Destailleur
59711298c3
Fixed: Length of project label is no more truncated on element cards
...
(invoice, proposal, order...)
2015-01-30 16:33:39 +01:00
Laurent Destailleur
4fdc287717
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/customer/card.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/admin/menus.php
htdocs/fourn/commande/card.php
htdocs/install/check.php
2015-01-30 15:53:06 +01:00
Laurent Destailleur
43702cf662
New: Enhance stock management: Introduce tag to define if a subproduct
...
must have stock decreased and add inventory code on stock movements.
2015-01-30 01:51:28 +01:00
phf
3b0fd5ec98
[CORE] modification légère, début de redirection pour créer une commande fournisseur si la demande est accépté (#new_ask_price).
2015-01-29 17:36:12 +01:00
Laurent Destailleur
b61c475aa8
Clean code for validate permissions. "validate" is a status to say, "now
...
it exists, it is no more a draft", so by default we don't need this
permissions (it is same than create). We keep "validate" permissions as
an "advanced" permission only.
2015-01-25 21:32:40 +01:00
Laurent Destailleur
ad68b3ca6c
Fixed approve during validation if user has permission
...
Fixed error management
Fixed rendering country must be same for all tabs.
2015-01-25 00:59:46 +01:00
frederic34
76bf95789d
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/fourn/commande/list.php
2015-01-24 21:51:33 +01:00
frederic34
e18577aa62
Tooltip and lib for file cache
2015-01-24 21:46:05 +01:00
Laurent Destailleur
267ba24820
Generalize option PROJECT_SHOW_REF_INTO_LISTS
2015-01-24 21:41:40 +01:00
frederic34
12c8d4ba1f
Merge remote branch 'upstream/develop' into tooltip
2015-01-22 00:44:50 +01:00
frederic34
f4161b457b
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
Ion Agorria
2c01370ce6
Reimplemented 'find_min_price_product_fournisseur()'
2015-01-21 05:22:46 +01:00
Laurent Destailleur
da75877caa
Merge pull request #2264 from frederic34/patch-2
...
Use getNomUrl on every list to uniformize display
2015-01-21 00:03:21 +01:00
frederic34
1b0dd671b3
Add tooltip in getNomUrl link
2015-01-20 21:40:33 +01:00
jean
b809f0aeb8
Merge remote-tracking branch 'origin/3.6' into 3.6
2015-01-20 17:31:17 +01:00
Frédéric FRANCE
fb9f53010f
Update index.php
2015-01-19 20:36:38 +01:00
Frédéric FRANCE
1fc9517200
Use css badge
2015-01-19 19:18:57 +01:00
Frédéric FRANCE
e82301e001
Update card.php
2015-01-19 19:07:34 +01:00
Laurent Destailleur
e220ce5a82
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.formcompany.class.php
htdocs/custom/.gitignore
htdocs/expedition/card.php
htdocs/fourn/card.php
htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/adherents/fiche.php
htdocs/comm/fiche.php
htdocs/comm/mailing/fiche.php
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/paiement.php
htdocs/core/class/html.formcompany.class.php
htdocs/core/tpl/login.tpl.php
htdocs/expedition/fiche.php
htdocs/fourn/commande/fiche.php
htdocs/fourn/facture/fiche.php
htdocs/fourn/facture/paiement.php
htdocs/fourn/fiche.php
htdocs/main.inc.php
htdocs/product/fournisseurs.php
htdocs/resource/card.php
2015-01-18 17:13:42 +01:00
Laurent Destailleur
7c5927ef93
Merge branch 'bug-1796' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1796
Conflicts:
ChangeLog
2015-01-18 15:08:49 +01:00
Marcos García de La Fuente
7f59cf9194
Fix: [ bug #1787 ] Incorrect behaviour of doActions hook
2015-01-17 19:28:27 +01:00
Marcos García de La Fuente
41e01a22a3
Fixed loading of external numeration modules in Contrat, Commande, Facture, Contrat, Expedition, Fichinter, CommandeFournisseur and uniformized code
2015-01-17 18:58:05 +01:00
Marcos García de La Fuente
ed839114ab
Fixed loading of external numeration modules in FactureFournisseur and Propal
2015-01-17 18:42:19 +01:00
Laurent Destailleur
007f18bcf7
Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into
...
GPCsolutions-review
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/comm/action/peruser.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/accounting.lib.php
htdocs/core/lib/report.lib.php
2015-01-17 15:11:12 +01:00
Laurent Destailleur
8cd46e4830
Introduce option MAIN_HTML_TITLE to start to control format of html
...
title content.
2015-01-17 14:34:16 +01:00
Laurent Destailleur
6f00cecd81
Merge pull request #2244 from KreizIT/fix_default_empty
...
FIX : Creating default object from empty when validating supplier order
2015-01-16 12:03:23 +01:00
KreizIT
a9008c4993
Fix Creating default object from empty on supplier order confirmation
2015-01-15 17:40:15 +01:00
Cedric
999a6052ff
FIX : Creating default object from empty when validating supplier order
2015-01-15 16:23:10 +01:00
Marcos García de La Fuente
71b609fab0
Fix: [ bug #1801 ] FAC_FORCE_DATE_VALIDATION constant alters supplier invoice date given to numeration modules
2015-01-15 13:08:33 +01:00
Laurent Destailleur
f92bc7986b
Add Weighted average price as default price for buying price for margin
...
calculation. Add option MARGIN_PMP_AS_DEFAULT_BUY_PRICE to replace
with first supplier price.
2015-01-14 10:46:50 +01:00
Laurent Destailleur
033e77c04a
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/product/stock/product.php
2015-01-13 15:41:45 +01:00
Laurent Destailleur
8b3faf46db
Add PMP into selection of buy price.
2015-01-13 15:38:59 +01:00
Laurent Destailleur
dda12003d4
Fixed: User of creation was not visible.
2015-01-10 12:23:15 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +01:00
Ion Agorria
5bbcb58b44
Added expressions for product/service prices
2014-12-28 01:26:41 +01:00
Laurent Destailleur
5ead994955
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
2014-12-26 04:57:55 +01:00
Laurent Destailleur
657fc1b91c
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/fiche.php
htdocs/core/lib/functions2.lib.php
htdocs/fourn/fiche.php
htdocs/langs/fr_FR/compta.lang
htdocs/projet/element.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/time.php
2014-12-26 04:44:15 +01:00
Laurent Destailleur
5215b1e641
Merge pull request #2186 from marcosgdf/bug-575
...
Fix [ bug #575 ] GED doesn't works if there is "/" in a mask
2014-12-26 04:02:01 +01:00
Marcos García de La Fuente
aec1bdb3c4
Fixed [ bug #1766 ] PHP Warning when adding a service to a supplier invoice
2014-12-25 23:08:07 +01:00
Marcos García de La Fuente
1f00794c98
Fixed bug which didn't show documents in auto GED when an object had '/' in its ref
2014-12-25 21:47:39 +01:00
Laurent Destailleur
08fd74e79e
Fix: [ bug #1687 ] The ref filter searches on ref and rowid in supplier
...
invoices list
2014-12-25 12:07:27 +01:00
Laurent Destailleur
2b4edd9996
Fix: [ bug #1687 ] The ref filter searches on ref and rowid in supplier
...
invoices list
2014-12-23 13:21:40 +01:00
Marcos García de La Fuente
3212fd2b27
Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify
2014-12-23 11:00:18 +01:00
Laurent Destailleur
2a3bb96c34
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/ecm.lib.php
2014-12-22 03:14:22 +01:00
Laurent Destailleur
8996953077
Fix: error reported by scrutinizer
2014-12-20 15:42:03 +01:00
Laurent Destailleur
4769e26d8e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
2014-12-18 12:34:41 +01:00
Laurent Destailleur
38ba6ac75b
Fixed: pgsql to make order
2014-12-18 11:48:30 +01:00
Laurent Destailleur
711b033844
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/html.form.class.php
htdocs/product/stock/card.php
2014-12-14 12:35:13 +01:00
Laurent Destailleur
b681885542
Fixed: Bad url link
2014-12-10 21:14:59 +01:00
Laurent Destailleur
475d749a97
Fix: phpcheckstyle
2014-12-04 01:11:13 +01:00
Laurent Destailleur
1e8e4e7fda
Prepare 3.8 dev
...
Fix bad test.
Renamed table for dynamic prices.
2014-12-03 17:06:44 +01:00
Laurent Destailleur
e395fd8096
Fix CRLF
2014-11-30 15:24:39 +01:00
Ion Agorria
fac46b3b46
Code for dinamic prices funcionality
2014-11-29 06:31:35 +01:00
Laurent Destailleur
a724c3aa70
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/main.inc.php
2014-11-28 02:26:40 +01:00
Marcos García de La Fuente
5cc015268e
Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks
2014-11-28 01:02:59 +01:00
Laurent Destailleur
806719b562
Merge pull request #2089 from marcosgdf/bug-1718
...
Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks
2014-11-28 00:37:56 +01:00
Laurent Destailleur
232921a506
Fixed: Add option on a not common new feature
2014-11-28 00:34:03 +01:00
Laurent Destailleur
d9cb9c1585
Merge pull request #2102 from aspangaro/develop-center
...
Task 1603 - Remove <center> deprecated HTML5 tags
2014-11-27 23:58:44 +01:00
aspangaro
c4c69e191b
Replace <center> tags
2014-11-25 20:13:43 +01:00
Marcos García de La Fuente
082f67a6e4
Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks
2014-11-24 12:49:33 +01:00
Laurent Destailleur
e3710bb61a
Merge pull request #2084 from frederic34/patch-3
...
Fix Typo
2014-11-23 17:47:55 +01:00
Frédéric FRANCE
ba7500a504
Update /fourn/facture/impayees.php
2014-11-23 17:45:14 +01:00
Frédéric FRANCE
0384f90607
Update /fourn/facture/paiement.php
2014-11-23 17:45:11 +01:00
Frédéric FRANCE
afc87f5445
Update /fourn/commande/list.php
2014-11-23 17:45:07 +01:00
Frédéric FRANCE
f6db1d5da2
Update /fourn/list.php
2014-11-23 17:43:52 +01:00
Frédéric FRANCE
486d24b8db
Fix Typo
2014-11-23 17:43:06 +01:00
Laurent Destailleur
33eae22b26
Merge pull request #2070 from frederic34/patch-5
...
(GETPOST("button_removefilter_x") || GETPOST("button_removefilter"))
2014-11-23 17:40:28 +01:00
Marcos García de La Fuente
5578bc6f5d
Fixed [ bug #1658 ] Linked files in supplier invoices wrongly shows amounts
2014-11-23 16:55:12 +01:00
Laurent Destailleur
5b4241582a
Merge pull request #2076 from marcosgdf/bug-1658
...
Fixed [ bug #1658 ] Linked files in supplier invoices wrongly shows amounts
2014-11-23 16:52:55 +01:00
Marcos García de La Fuente
835b359179
Fixed [ bug #1658 ] Linked files in supplier invoices wrongly shows amounts
2014-11-23 15:42:29 +01:00
Frédéric FRANCE
38febad979
Update /fourn/facture/impayees.php
2014-11-23 10:05:40 +01:00
Frédéric FRANCE
edaf6aec10
Update /fourn/facture/paiement.php
2014-11-23 10:04:43 +01:00
Frédéric FRANCE
018d1488fc
Update /fourn/commande/list.php
2014-11-23 10:03:03 +01:00
Frédéric FRANCE
89deffa3a7
Update /fourn/list.php
2014-11-23 09:36:07 +01:00
Frédéric FRANCE
b2a1408d8e
Fix 1667 Pagination is only partially shown in supplier references list
2014-11-23 00:51:13 +01:00
Laurent Destailleur
e4804f99ff
Merge pull request #2047 from frederic34/patch-6
...
#1685-1686 Clear sort filter works partially in supplier invoices
2014-11-22 15:50:16 +01:00
Laurent Destailleur
830d470c33
Merge pull request #2047 from frederic34/patch-6
...
#1685-1686 Clear sort filter works partially in supplier invoices
2014-11-22 15:48:28 +01:00
Laurent Destailleur
d6cb29a17b
Merge pull request #2048 from frederic34/patch-7
...
#1689 Can't sort supplier invoice payments on amounts
2014-11-22 15:47:55 +01:00
Laurent Destailleur
7fbeb2cbcb
Merge pull request #2053 from aspangaro/1688
...
#1688 The ref filter searches on rowid not on ref in unpaid supplier inv...
2014-11-22 15:41:39 +01:00
Frédéric FRANCE
93ed5875d3
#1650 Can't display supplier products in it's card
...
I think error is in sql request for last supplier invoice list because there is no sql request in supplier products
To avoid error in mysql strict mode
sql-mode="STRICT_ALL_TABLES,ONLY_FULL_GROUP_BY,NO_ZERO_DATE"
2014-11-19 15:50:18 +01:00
aspangaro
e3edc3f690
#1688 The ref filter searches on rowid not on ref in unpaid supplier invoices list
2014-11-18 21:55:41 +01:00
Frédéric FRANCE
e9966c50da
#1689 Can't sort supplier invoice payments on amounts
2014-11-18 00:04:45 +01:00
Frédéric FRANCE
d8192d8223
#1685-1686 Clear sort filter works partially in supplier invoices
2014-11-18 00:02:53 +01:00
Laurent Destailleur
81e203eef1
Fix: Ref was not visible.
2014-11-15 20:48:39 +01:00
Laurent Destailleur
c186f13218
Fix: Param $action was not defined.
...
A better fix must be done later be removing useless hooks that are
duplicate with triggers.
2014-11-15 19:04:21 +01:00
Laurent Destailleur
445f696d28
Fix: Pb of object with wrong type.
2014-11-15 18:24:38 +01:00
Laurent Destailleur
e3f4db85af
Fix divers
2014-11-07 23:07:15 +01:00
Laurent Destailleur
5cb6b11878
Merge pull request #2007 from aspangaro/develop-search
...
Improvement into list & presentation/typo
2014-11-07 21:47:37 +01:00
Juanjo Menent
3880013940
Fix hooks from supplierorder to supplierinvoice
2014-11-06 23:10:21 +01:00
Juanjo Menent
2f30e769f6
Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown
2014-11-06 22:16:27 +01:00
aspangaro
acbbe823e8
Typo
2014-11-06 20:04:51 +01:00
aspangaro
b60f834d8d
Improve search into supplier command list
2014-11-06 07:19:16 +01:00
aspangaro
85f0462c20
Suppliers list
2014-11-02 15:16:49 +01:00
aspangaro
1dcb7a58f3
Presentation & fix SQL injection
2014-11-02 14:51:21 +01:00
aspangaro
6109529c6c
vat payments list & typo on css class
2014-11-02 14:19:28 +01:00
aspangaro
d6a42bda95
Merge remote-tracking branch 'Upstream/develop' into develop-search
2014-11-02 13:55:57 +01:00
Laurent Destailleur
5086450f35
Fix: Forging email content must use dol_concatdesc.
2014-11-02 12:32:38 +01:00
aspangaro
64b9299eb6
Suppliers invoice payment list
2014-11-02 08:45:42 +01:00
aspangaro
e48350fdc1
Unpayed suppliers invoices list
2014-11-02 08:33:39 +01:00
aspangaro
98299f88e8
Suppliers list
2014-11-02 08:12:34 +01:00
Laurent Destailleur
a1a10edc30
Merge pull request #1987 from IonAgorria/soap-client-order
...
Added SOAP client for creating a client order in remote webservice
2014-11-01 21:14:19 +01:00
Ion Agorria
82aa8458bf
Added ws url/key to thirdparty SQL table, class and info page
2014-10-31 17:46:11 +01:00
Ion Agorria
557cbaf3d7
Added module descriptor and activation checks
...
Corrected 3 missing $error_occurred flags
2014-10-31 04:59:57 +01:00
Laurent Destailleur
28c0c55780
Merge pull request #1977 from atm-maxime/develop
...
Add : statistics on supplier orders and invoices on home page
2014-10-30 17:59:07 +01:00
Laurent Destailleur
d6c1b71350
Merge pull request #1983 from atm-maxime/mkoevols
...
Fixes on extrafields, product supplier prices and user / company association deletion
2014-10-30 17:49:53 +01:00
Ion Agorria
e875f0c2b8
Fixed missing separator
2014-10-29 05:33:59 +01:00
Ion Agorria
4ff570571e
Added SOAP client for creating a client order in remote
...
webservice that thirdparty might have.
2014-10-29 05:13:15 +01:00
Laurent Destailleur
132ddf65d6
Fix: several bugs into document generation (default must be used in
...
priority when not template defined).
Fix: use first odt file when no odt file defined.
Fix: Must use output translation.
2014-10-27 19:37:30 +01:00
Maxime Kohlhaas
7b7b7e79e9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into mkoevols
...
Conflicts:
htdocs/core/lib/company.lib.php
2014-10-27 11:17:44 +01:00
Maxime Kohlhaas
a5739c248e
Fix : Product supplier prices were not working anymore due to bad SQL
2014-10-27 10:23:33 +01:00
Laurent Destailleur
6f77dc83c4
Qual: Uniformize code and fix a ton of bugs.
2014-10-27 03:24:45 +01:00
MAxime Kohlhaas
3a626d8503
Add : statistics on supplier orders and invoices on home page
2014-10-25 17:22:03 +02:00
Laurent Destailleur
4d515d660c
New: Feature to link manually an order to an invoice does not disappear
...
once link has been done.
2014-10-24 14:17:36 +02:00
Laurent Destailleur
639d4f03a0
Experimentation option PROJECT_SHOW_REF_INTO_LISTS
2014-10-22 17:47:12 +02:00
jean
619bcb44df
object must be reloaded before creating pdf on confirmation and ordering
2014-10-21 19:02:48 +02:00
Maxime Kohlhaas
ee4b807a5d
Qual : refactoring extrafields display on objects into a single tpl file
2014-10-14 17:00:06 +02:00
Laurent Destailleur
9768550696
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/categories/fiche.php
htdocs/comm/action/index.php
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/fiche.php
htdocs/product/composition/fiche.php
htdocs/product/price.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
2014-10-12 02:54:34 +02:00
Laurent Destailleur
c30f13a03d
Fix: label of input method not translated.
2014-10-12 02:07:50 +02:00
Regis Houssin
a2446e51db
New: add context "globalcard" for declaring only once all cards
2014-10-06 07:20:58 +02:00
Laurent Destailleur
11d1be882c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/contrat/list.php
2014-10-04 17:32:01 +02:00
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +02:00
Laurent Destailleur
d9f898ab8c
Merge pull request #1916 from FHenry/develop
...
Add feature to order to invoice on supplier part
2014-10-04 00:31:11 +02:00
Regis Houssin
30221ae8cf
Fix: missing fields
2014-10-02 09:00:40 +02:00
Florian HENRY
46f673fb5f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fourn/card.php
2014-09-29 16:01:49 +02:00
Laurent Destailleur
ba33f73767
Merge pull request #1925 from tiaris/develop
...
adding hooks for supplier card and order card
2014-09-29 15:40:31 +02:00
Florian HENRY
ce145cc056
Add cache excel export on harddrive with
...
MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR const. It can avoid lot's of stack
overflow on large excel export
2014-09-29 10:16:48 +02:00
Laurent Destailleur
ec95aacd52
Uniformize code for error reporting after a hook.
2014-09-28 03:41:32 +02:00
Laurent Destailleur
722e939e19
Fix: form must not be into a closing and opening tr tag.
2014-09-26 13:23:54 +02:00
Florian HENRY
3bc227b467
Fix for travis syntax
2014-09-25 10:25:15 +02:00
jean
e9374e8c08
adding hook for addMoreActionsbuttons
2014-09-25 09:26:32 +02:00
jean
6149994b43
Adding hook 'suppliercard' on supplier cartd
2014-09-24 22:05:53 +02:00
Laurent Destailleur
396bae21d6
Fix: Missing closing tr
2014-09-24 18:15:20 +02:00
Florian HENRY
518d23f278
Add feature to order to invoice on supplier part
2014-09-23 16:28:29 +02:00
Florian HENRY
860253759b
Add hook for addMorButton into supplier card
2014-09-23 11:59:57 +02:00
Laurent Destailleur
dc96e10215
Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into
...
marcosgdf-oop-pdf
Conflicts:
htdocs/projet/class/project.class.php
2014-09-23 00:02:19 +02:00
Marcos García de La Fuente
016c889aa8
Refactored CommandeFournisseur::generateDocument and FactureFournisseur::generateDocument
2014-09-22 00:15:32 +02:00
Marcos García de La Fuente
ca9e33e809
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into oop-pdf
2014-09-21 18:00:56 +02:00
aspangaro
1592968709
Merge remote-tracking branch 'Upstream/develop' into develop
2014-09-20 06:42:31 +02:00
Juanjo Menent
e39373ed9a
- Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since
...
3.6.0 in supplier invoices when adding a line
2014-09-19 09:58:58 +02:00
Juanjo Menent
c87e28d5f9
- Fix: [ bug #1593 ] Spanish Localtax IRPF not being calculated since
...
3.6.0 in supplier invoices when adding a line
2014-09-19 09:57:35 +02:00
Raphaël Doursenaud
c7c809a609
FIX: Wrong type hinting
2014-09-19 03:05:20 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521
Qual: Renamed all files & links "liste.php" into "list.php"
2014-09-18 20:33:37 +02:00
aspangaro
9da597d56e
Merge remote-tracking branch 'Upstream/develop' into develop
2014-09-18 20:18:56 +02:00
aspangaro
7a9ce455d9
Uniformize code $_SERVER["PHP_SELF"]
2014-09-18 20:13:38 +02:00
Juanjo Menent
90edd96646
Fix: Invoices payments may be older than invoices
2014-09-18 10:11:39 +02:00
Juanjo Menent
ab83e22a12
Fix: Invoices payments may be older than invoices
2014-09-18 09:57:13 +02:00
Marcos García de La Fuente
9ae7486555
Removed deprecated usage of supplier_order_pdf_create and supplier_invoice_pdf_create
2014-09-16 21:42:07 +02:00
Marcos García de La Fuente
e71dc6bc32
Created a method generateDocument for several classes
...
Which are: Commande, Contrat, Livraison, Facture, Projet, Propal, Task, Expedition, CommandeFournisseur, FactureFournisseur and therefore deprecated the following methods supplier_order_pdf_create, supplier_invoice_pdf_create, delivery_order_pdf_create, task_pdf_create, propale_pdf_create, project_pdf_create, facture_pdf_create, expedition_pdf_create, commande_pdf_create
2014-09-16 12:30:37 +02:00
Laurent Destailleur
83447243ae
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
build/debian/get-orig-source.sh
htdocs/product/class/product.class.php
htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
build/debian/control
htdocs/compta/bank/account.php
htdocs/fourn/paiement/fiche.php
htdocs/product/class/product.class.php
htdocs/product/fiche.php
2014-09-15 22:52:59 +02:00
Laurent Destailleur
822a3ebe7e
Merge branch 'bug-1548' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1548
Conflicts:
ChangeLog
2014-09-14 21:37:15 +02:00
Marcos García de La Fuente
9426298b95
[ bug #1548 ] Supplier payment card shows type in French
2014-09-14 14:19:46 +02:00
Marcos García de La Fuente
949ae2f160
[ bug #1591 ] Linked object block shows Total HT/TTC even if not having permission to read them
2014-09-14 13:09:31 +02:00
Laurent Destailleur
f264e25514
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/adherents/liste.php
htdocs/compta/bank/bankid_fr.php
htdocs/holiday/index.php
htdocs/opensurvey/list.php
2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214
Fix: SQL injection
2014-09-13 19:04:25 +02:00
Laurent Destailleur
342e26f679
Merge
2014-09-07 12:22:04 +02:00
Laurent Destailleur
522b5a91bc
Fix: Filter on direction of payment mode was not working.
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/fiche.php
2014-09-06 00:21:09 +02:00
Laurent Destailleur
2b9b110f9c
Fix: Filter on direction of payment mode was not working.
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/fiche.php
2014-09-06 00:16:24 +02:00
Laurent Destailleur
e7e48f6b2b
Doxygen
...
Add constant to enable bank during proposal (not enough common).
2014-09-04 22:37:33 +02:00
Laurent Destailleur
643fc6c61f
Fix: Bad use of fetch_lines
...
Conflicts:
htdocs/comm/propal.php
htdocs/contrat/fiche.php
htdocs/opensurvey/class/opensurveysondage.class.php
2014-09-04 19:03:48 +02:00
Laurent Destailleur
73ad0f9302
Fix: Bad use of fetch_lines
2014-09-04 18:58:33 +02:00
Laurent Destailleur
229cbc2342
Merge pull request #1834 from Cubexed/develop
...
Enables the fetching and saving of start and end dates in supplier order lines.
2014-09-02 19:48:36 +02:00
Laurent Destailleur
0bc511a626
Merge pull request #1850 from braito4/patch-1
...
Update fiche.php
2014-09-02 19:12:09 +02:00
Laurent Destailleur
f64cb085a7
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/fourn/class/fournisseur.commande.class.php
2014-08-30 18:27:34 +02:00
Laurent Destailleur
79b081a7b7
Merge pull request #1845 from Cubexed/patch-1
...
Fix unable to delete order line
2014-08-28 12:00:21 +02:00
Philippe GRAND
08c621037c
fix : missing code for extrafields
2014-08-27 11:41:18 +02:00
braito4
f5883741bf
Update fiche.php
...
Proyect selection was missing
2014-08-26 20:20:29 +02:00
Cubexed
00856eb277
Merge remote-tracking branch 'upstream/develop' into develop
2014-08-26 17:29:42 +02:00
Cubexed
a97241f716
Fix unable to delete order line
...
Calling trigger without having globalized $conf causes error and cancels delete operation, this commit adds the missing
2014-08-23 16:52:05 ERR 127.0.0.1 Interfaces::run_triggers was called with wrong parameters action=LINEORDER_SUPPLIER_DELETE object=1 user= langs= conf=
2014-08-23 17:05:08 +02:00
Laurent Destailleur
ff6368b39f
Merge pull request #1838 from GPCsolutions/triggers_globals
...
Fix: missing global declarations
2014-08-21 23:31:29 +02:00
Laurent Destailleur
bc0c5fb55e
New: Can modify order with status approved if it was not sent yet to
...
supplier.
2014-08-21 14:24:06 +02:00
Raphaël Doursenaud
1d5fb1320b
Fix: missing global declarations
2014-08-20 19:03:58 +02:00
Cubexed
ecd90ddbff
Enables the fetching and saving of start and end dates in supplier order lines.
2014-08-18 23:02:04 +02:00
Laurent Destailleur
3e9ddbfcd0
Fix: [ bug #1547 ] Untranslated Paiementfourn.class.php error messages
2014-08-17 00:38:09 +02:00
Laurent Destailleur
d6c4993c40
Merge pull request #1822 from Devensys/Devlop-PayTotalButton
...
Add button to fill amount paiement
2014-08-14 01:28:20 +02:00
Laurent Destailleur
e424ae5b86
Merge pull request #1760 from FHenry/develop
...
Remane contract ref_ext to ref_supplier
2014-08-13 23:54:19 +02:00
Laurent Destailleur
98f140962a
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-13 19:25:55 +02:00
Laurent Destailleur
6c316d0cda
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-08-13 19:23:45 +02:00
Florian HENRY
bab7533578
Enable supplier price log table
2014-08-12 18:16:59 +02:00
Andrelec1
1ce4996a34
finish implement
...
remove old code and add new one ...
2014-08-12 11:34:53 +02:00
Andrelec1
3548f72d8a
Start implement
2014-08-11 18:14:40 +02:00
Laurent Destailleur
42d992b009
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/lib/project.lib.php
htdocs/fourn/facture/fiche.php
htdocs/projet/class/project.class.php
2014-08-08 01:26:53 +02:00
Laurent Destailleur
055397a94b
New: Can attach supplier order to a customer order.
2014-08-07 15:12:27 +02:00
Maxime Kohlhaas
1caf39ad22
Merge branch '3.5' of github.com:Dolibarr/dolibarr into 3.5
2014-08-07 12:26:18 +02:00
Laurent Destailleur
20cef1512f
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-08-06 21:34:47 +02:00
Laurent Destailleur
98eb39bf9c
Fix: PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS is correctly supported
2014-08-06 16:46:04 +02:00
Maxime Kohlhaas
546b31b9d0
Fix : Filtering on fourn paiement list was not working
2014-08-06 12:02:44 +02:00
Laurent Destailleur
bb8ec0c8f9
Fix: Too many parameter
2014-08-01 14:26:13 +02:00
Laurent Destailleur
59e98f97e3
Merge branch 'develop' of github.com:grandoc/dolibarr into
...
grandoc-develop
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2014-07-31 17:47:32 +02:00
Philippe Grand
5aea97affd
Update fournisseur.commande.class.php
...
missing code for extrafields
2014-07-31 17:02:17 +02:00
Laurent Léonard
0228cd9db7
Fix translations in e-mail forms
2014-07-28 02:45:58 +02:00
Laurent Destailleur
5caa7ccd13
Merge pull request #1765 from marcosgdf/patch-3
...
Added formConfirm and doAction for supplier invoice card
2014-07-25 22:17:09 +02:00
Marcos García de La Fuente
f3cbe1beac
Task #1511 and updated changelog
2014-07-23 06:20:17 +02:00
Marcos García de La Fuente
f5d1d1563b
Corrected indentation (again)
2014-07-22 04:27:41 +02:00
Marcos García de La Fuente
c813077f82
Corrected indentation
2014-07-22 04:25:44 +02:00
Marcos García de La Fuente
4f582609f4
Added formConfirm and doAction for supplier invoice card
2014-07-22 04:24:08 +02:00
Juanjo Menent
acaca341ab
Fix: [ bug #1521 ] The second order's page from a provider shows all
...
orders
Conflicts:
ChangeLog
2014-07-21 17:00:59 +02:00
Juanjo Menent
8cd2e00e5f
Fix: [ bug #1521 ] The second order's page from a provider shows all
...
orders
2014-07-21 16:57:08 +02:00
Laurent Destailleur
7ac4a6f43c
New: Show amount and status of supplier invoice also on document tab.
2014-07-20 19:35:45 +02:00
Laurent Destailleur
8bc655b44f
Fix: Bad alignement of cells
2014-07-20 19:35:00 +02:00
Laurent Destailleur
dec7fe42af
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/fourn/commande/fiche.php
2014-07-20 15:37:50 +02:00
Laurent Destailleur
bf926cd791
Merge pull request #1756 from marcosgdf/messages
...
Migrated old message notifications to the """new""" system
2014-07-20 04:57:09 +02:00
Laurent Destailleur
5be7e75fe6
Merge pull request #1752 from marcosgdf/doactions-supplier
...
Added missing doActions for supplier order fiche.php
2014-07-20 04:49:27 +02:00
Laurent Destailleur
8137fd7fe4
Fix: Type of line (product/service) could not be edited on supplier
...
order/invoice.
2014-07-20 02:36:03 +02:00
Marcos García de La Fuente
4f4ac30fc0
Deprecating arbitrary use of dol_htmloutput* functions
2014-07-20 02:32:13 +02:00
Marcos García de La Fuente
43597c1731
Migrated old error notifications to the """new""" system
2014-07-20 01:43:46 +02:00
Marcos García de La Fuente
434bb1bec7
Migrated old message notifications to the """new""" system
2014-07-20 00:10:40 +02:00
Laurent Destailleur
b42a33b203
Fix: For contract, only services available by default. Product appears
...
if option is set only.
2014-07-19 21:14:56 +02:00
Marcos García de La Fuente
63585ea9ca
Added missing doActions for supplier order fiche.php
2014-07-18 01:32:54 +02:00
Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
KreizIT
b6edde320b
Conflict solved
2014-07-12 09:20:00 +02:00
KreizIT
9c2aaf7d23
[ Task #1495 ] Add trigger LINECONTRACT_CREATE
2014-07-12 00:27:33 +02:00
KreizIT
ff19a87941
[Task #1481 ] Enable BILL_SUPPLIER_MODIFY trigger
2014-07-11 23:40:17 +02:00
KreizIT
5e7c0639b0
Refactor: various trigger
2014-07-11 16:02:27 +02:00
KreizIT
5093fecc60
Refactor: SUPPLIER_PRODUCT_BUYPRICE_ * trigger
2014-07-11 15:50:40 +02:00
KreizIT
42ef7149fd
Refactor: BILL_SUPPLIER_* and LINEBILL_SUPPLIER_* trigger
2014-07-11 15:48:25 +02:00
KreizIT
bbdaa59921
Refactor: ORDER_SUPPLIER_* and LINEORDER_SUPPLIER_* trigger
2014-07-11 15:32:23 +02:00
frederic34
742bdcb715
Set bank account for supplier invoices
2014-07-09 18:44:20 +02:00
frederic34
387d36e4b0
Ste bank account for supplier order
2014-07-09 18:00:21 +02:00
Juanjo Menent
8e4e08f907
[ task #1063 ] Allow edit localtaxes rate for thirds. Improve visu
2014-07-04 16:48:42 +02:00
Laurent Destailleur
e496823778
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
.travis.yml
ChangeLog
htdocs/fourn/commande/fiche.php
htdocs/install/mysql/migration/3.5.0-3.6.0.sql
htdocs/product/stock/replenish.php
2014-07-04 14:14:40 +02:00
