Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 09:02:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
35,179 Commits 37 Branches 191 Tags
2ecb113d30c08e2a5178f50ffbe0c8a05751b71e
Commit Graph

1616 Commits

Author SHA1 Message Date
Laurent Destailleur
3eb485d521 Qual: Removed TODO, deprecated code and deprecated properties. This also 
fix missing combo box of contacts onto CC.
 2013-02-12 17:08:21 +01:00
Laurent Destailleur
28fa96b516 Fix: Bad choice of template 2013-02-10 21:56:29 +01:00
Regis Houssin
fcee35c65d Fix: $hookmanager is a global object 2013-01-26 10:35:30 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01:00
Regis Houssin
7983b1dec5 Fix: wrong object name 2013-01-25 12:37:03 +01:00
Regis Houssin
9868880142 Fix: missing files library 2013-01-23 11:29:58 +01:00
Laurent Destailleur
abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-19 16:29:16 +01:00
Laurent Destailleur
7002b328a8 Fix: [ bug #685 ] Supplier invoices should use encoding sequence number 
as secondary sorting field
 2013-01-19 15:32:03 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
Laurent Destailleur
a5b174eccc Fix: Architecture of getCurrency was wrong. Cache was not stored 
correctly and dict file loaded several times. There was also bug on PHP
without mb_string function.
Now function is a method of $langs object. All bug fixes.
 2013-01-18 15:57:11 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Laurent Destailleur
0b045a2d96 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
	htdocs/filefunc.inc.php
 2013-01-16 14:11:19 +01:00
fhenry
b8dfee2a3b Fix bug [ bug #692 ] Can't search for suppliers invoice 2013-01-15 23:03:03 +01:00
Christophe Battarel
49703240f7 show costprice instead of buyingprice if setup of margin module is costprice 2013-01-11 15:39:11 +01:00
Christophe Battarel
38e9290729 show costprice instead of buyingprice if setup of margin module is costprice 2013-01-11 15:33:34 +01:00
Laurent Destailleur
142f171e50 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/.gitignore
 2013-01-08 11:10:47 +01:00
Laurent Destailleur
091e469050 Fix: [ bug #622 ] attaching wrong file when sending the invoice via 
e-mail
 2013-01-07 00:40:18 +01:00
eldy
2c59c6311f Merge remote-tracking branch 'origin/3.3' into develop 2013-01-06 21:36:39 +01:00
Laurent Destailleur
567cd00f5c Fix: Lost button 
Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/facture/fiche.php
 2013-01-06 13:33:09 +01:00
Laurent Destailleur
5f99488c99 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/langs/es_ES/admin.lang
 2013-01-05 16:41:08 +01:00
simnandez
c0246c07b1 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-05 16:03:00 +01:00
simnandez
c639d80372 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-05 09:47:54 +01:00
simnandez
32b19802b1 Fix: [ bug #662 ] Bad aplication of Localtax2 for suppliers if country 
is Spain
 2013-01-05 09:43:40 +01:00
Laurent Destailleur
4fe1ba33f9 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
 2012-12-30 18:00:07 +01:00
Laurent Destailleur
df43d477fc Merge pull request #562 from simnandez/3.3 
Fix: Supplier is mandatory into adding invoice suppliers
 2012-12-30 08:38:34 -08:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694 Fix: change for a neutral email 2012-12-30 15:11:07 +01:00
simnandez
9732a2f336 Fix: Supplier is mandatory into adding invoice suppliers 2012-12-30 10:26:18 +01:00
simnandez
f0f45b70da Fix: Supplier is mandatory into adding invoice suppliers 2012-12-30 10:24:20 +01:00
Laurent Destailleur
2d0dea18ce Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/compta/bank/search.php
 2012-12-29 17:38:12 +01:00
Laurent Destailleur
1667228d74 Fix: Normalize new trigger names. 2012-12-29 16:42:30 +01:00
Marcos García
0c113d33a6 Removed unuseful code 
Some lines may be marked as changed but they are not because of incorrect line endings
 2012-12-29 13:12:45 +01:00
Marcos García
c8eac78a8d Translated labels that weren't being translated and improved es_ES translations 2012-12-29 00:24:55 +01:00
Laurent Destailleur
ec767a9772 Correct path determination if origin is project 2012-12-21 15:39:21 +01:00
Christophe Battarel
88db3da002 allowing product search by supplier ref 2012-12-05 19:51:25 +01:00
Maxime Kohlhaas
64f5d59ddf Fix : on supplier bill validation, question about stock was asking for stock decrease instead of increase 2012-12-05 15:42:59 +01:00
Laurent Destailleur
5d27fd61df Beautify instal pg. 
Fix: Debian package
Restore PHPUnit test (A PHP Unit test that fails should not be removed
but fixed and be kept in error until fix is published. Otherwise,
PHPUnit are useless).

Conflicts:
	htdocs/install/fileconf.php
	htdocs/install/inc.php
 2012-12-05 00:45:10 +01:00
Regis Houssin
c0fba8262f FIXME pending correction of the "addline" method 2012-12-03 11:20:03 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Laurent Destailleur
4abae05c26 Qual: Uniformize behaviour of product selection 2012-11-26 13:37:40 +01:00
Laurent Destailleur
b977ea5d87 Fix: Regression. Show bad error message when we add a product with no 
prices defined.
 2012-11-25 20:38:39 +01:00
Laurent Destailleur
6db5185d7e Fix: Missing include 2012-11-20 23:57:35 +01:00
Regis Houssin
8e141fce14 Fix: strict mode father 2012-11-13 22:43:54 +01:00
Laurent Destailleur
e7164cb243 Fix: Some checkstyle errors 2012-11-11 18:18:57 +01:00
Laurent Destailleur
027ad065a5 Removed TODO 2012-11-05 12:04:13 +01:00
Laurent Destailleur
80c252dd62 Fix: Use same labels to go back to draft than other elements. 
Re-open is for "closed" to a validated status.
Modify is for a validated status to draft.
 2012-11-03 21:33:55 +01:00
Regis Houssin
77e45f70a4 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-11-03 19:16:02 +01:00
Regis Houssin
d0dc336a85 New: jQuery and jQuery UI upgrade 
New: jQuery Timepicker addon for Datepicker
 2012-11-03 19:15:45 +01:00
Laurent Destailleur
078b015db8 Work on multitax (vat). Need your test. 
Qual: Because params were often missing in calculate_price(), params are
now mandatory.
 2012-11-03 16:32:49 +01:00