Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 11:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
69,068 Commits 36 Branches 190 Tags
cefaeb583ff12ad09c836fcbf6b39d01209e901b
Commit Graph

97 Commits

Author SHA1 Message Date
Laurent Destailleur
d55213286e Fix missing parameter 2017-06-30 11:40:26 +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
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
302e086f99 Fix pgsql compatibility 2017-06-20 13:33:26 +02:00
Regis Houssin
fa58f0f3e8 Fix: add entity filter 2017-06-09 09:25:15 +02:00
Regis Houssin
2df33d1df3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc
 2017-06-03 11:45:15 +02:00
Laurent Destailleur
7f18dfee0d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/build_class_from_table.php
	dev/skeletons/skeleton_card.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/projet/card.php
 2017-06-03 01:55:05 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
gauthier
6b7c4cbbe1 FIX : default param 2017-05-30 16:00:21 +02:00
gauthier
c66695bd56 FIX : origin & originid on supplierproposal 2017-05-30 15:35:51 +02:00
Laurent Destailleur
fa290c34fa Fix against SQL injection. Add phpunit to detect missing escapement. 2017-05-12 16:55:11 +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
0bffac6dc4 Use constant vor status. 2017-05-05 13:43:43 +02:00
Laurent Destailleur
884b261df5 Code comment 2017-05-05 12:51:47 +02:00
Laurent Destailleur
68b63927e0 Maxi miscellaneous debug 2017-05-05 12:33:49 +02:00
Laurent Destailleur
8009370f04 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/contact/document.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/mysql/migration/repair.sql
 2017-05-04 10:01:11 +02:00
Maxime Kohlhaas
396ea54894 Subprice was null in supplier proposal and line was not transfered to supplier order 2017-04-12 11:09:49 +02:00
Laurent Destailleur
3740137e31 Add tooltip on label of each open item. 2017-03-28 10:44:52 +02: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
gauthier
0730f84cf6 FIX : param php doc 2017-03-23 12:14:09 +01:00
gauthier
6cecab4c92 FIX : forgottent fk_unit field on llx_supplier_propaldet 2017-03-22 16:43:12 +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
deb91ad7c1 FIX Data lost during merge of thirdparties 2017-03-15 13:30:30 +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
9d3bd9d36f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2016-12-18 11:57:04 +01:00
Ferran Marcet
2777c4d4a5 FIX: Setting supplier as client when accept a supplier proposal 2016-12-14 18:35:59 +01:00
Laurent Destailleur
59291be6e0 NEW Can filter on status on objects on the "statistics" page. 2016-11-03 19:50:04 +01:00
Laurent Destailleur
220d81b350 Fix duplicate tooltips 2016-10-28 17:43:29 +02:00
Laurent Destailleur
6ef74b33c9 Uniformize code 2016-10-25 11:09:26 +02:00
BENKE Charlie
2a7ada6643 Uniformise trigger name 2016-10-07 12:07:17 +02:00
aspangaro
922495d72d Correct travis & typo "Execuete" 2016-09-24 07:18:38 +02:00
Laurent Destailleur
4f842fd2cb Uniformize look and feel 2016-09-19 13:57:50 +02:00
Laurent Destailleur
dc1bc33343 sql syntax 2016-09-02 21:48:02 +02:00
Laurent Destailleur
b529a53501 Fix var not initialized 2016-06-28 02:36:40 +02:00
Laurent Destailleur
149c6916f8 FIX ##5263 2016-06-03 22:20:58 +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
Laurent Destailleur
dd1f946afe Clean dead code 2016-04-09 19:06:40 +02:00
Laurent Destailleur
d1777a6783 Replace function rand with mt_rand (prepare php 8) 2016-03-05 15:01:25 +01:00
Laurent Destailleur
36474eabec NEW Add stats and late records into dashboard for supplier proposals. 2016-03-04 16:14:23 +01:00
Laurent Destailleur
c63ee8ceb5 Debug module supplier proposal 2016-03-04 16:08:51 +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
phf
e24a35b904 New add multicurrency on supplier proposal/order 2016-02-16 23:58:21 +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
5eea1ce7d9 Fix several warnings 2015-12-17 19:37:24 +01:00
Laurent Destailleur
5df193ec93 Uniformize code 2015-11-28 20:25:50 +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