lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
58,216 Commits 43 Branches 150 Tags 886 MiB
3333049341
Commit Graph

3080 Commits

Author SHA1 Message Date
Benoit
23af50ad2a Add fk_facture_fourn element to fetch lines objects 2017-05-10 22:45:41 +02:00
Laurent Destailleur
3e0fcf5ec2 Fix label "total for this page" on last page. 2017-05-10 11:57:59 +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
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
Marc de Lima Lucio
56e749df9f FIX: supplier order line were always created with rang = 0 2017-04-26 16:12:27 +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
a6b05bb4da Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0 2017-04-12 14:08:58 +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
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
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
90a90e1a3c FIX #6533 #6590 2017-03-28 12:45:09 +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
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
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
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
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
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
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
aefdc09cdc Fix missing MAIN_DISABLE_PDF_AUTOUPDATE 2017-02-22 14:33:44 +01:00
De Coninck Laurent
2ecf50a6cc generate new pdf when validate billing 2017-02-21 19:33:32 +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
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
arnaud
480d099d81 Fix project filter traduction 2017-02-03 16:19:13 +01:00
Laurent Destailleur
4d78e0d45c FIX #6315 2017-02-02 02:53:32 +01:00