2
0
forked from Wavyzz/dolibarr
Commit Graph

198 Commits

Author SHA1 Message Date
Laurent Destailleur
b3adbf53e5 Fix data for greece 2013-05-17 00:47:50 +02:00
Marcos García
a5009fd555 Corrected es_ES translations 2013-05-04 19:35:38 +02:00
simnandez
7b70fc4bf3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql
2013-04-07 14:30:44 +02:00
Laurent Destailleur
4e5a71fb22 New: Add local and vat rate for peru 2013-04-06 18:59:22 +02:00
simnandez
50548601ce Resolve conflicts 2013-04-06 08:20:57 +02:00
Regis Houssin
06485b065b Fix: bug #791 2013-04-04 08:56:19 +02:00
Laurent Destailleur
fbf8d410d2 New: Support revenue stamp onto invoices 2013-03-23 17:34:23 +01:00
Laurent Destailleur
c215974c8c Add missing vat rate for saudi arabia 2013-03-12 12:20:06 +01:00
Laurent Destailleur
e731d954b3 Translation 2013-03-12 12:00:53 +01:00
Laurent Destailleur
7138c6b0f9 T 2013-03-12 11:59:52 +01:00
Cedric GROSS
d16691c856 Add trigger BILL_UNVALIDATE when invoice is unvalidate 2013-03-09 17:38:35 +01:00
Laurent Destailleur
2a67af3c94 New: when adding an action, we can define a free code to tag it for
a specific need.
2013-03-08 12:04:01 +01:00
Laurent Destailleur
d92fd0eaed New: Add table, dictionnary and option to enable "revenue stamp". 2013-03-06 16:09:00 +01:00
frederic34
9333fdb97f WIP : Admin for Carriers 2013-02-23 15:23:33 +01:00
frederic34
67c06225a5 WIP : Admin for carriers 2013-02-22 14:18:51 +01:00
frederic34
de4bc7f39d Fix : It was a bad idea to add COL in the code name of new carriers 2013-02-22 08:56:14 +01:00
frederic34
d7f83c3520 New: Add some carrier 2013-02-21 11:23:12 +01:00
Laurent Destailleur
b21cb5b899 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture.php
	htdocs/filefunc.inc.php
2013-02-17 17:25:38 +01:00
Laurent Destailleur
365680d90e Fix: Missing vat rates 2013-02-13 21:25:17 +01:00
Laurent Destailleur
0383080d90 Fix: bad menu file name 2013-01-28 17:37:40 +01:00
Laurent Destailleur
9eaf8af341 Fix: Removed warning (this can be normal behaviour)
Fix: menu manager name has changed
2013-01-28 15:35:29 +01:00
Laurent Destailleur
05bd489b82 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/admin/index.php
2013-01-21 01:12:19 +01:00
Laurent Destailleur
9cf405f9d2 Fix: syntax error 2013-01-21 01:06:52 +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
simnandez
a57f291aa2 Fix: Bad Spanish departament name 2013-01-18 09:28:54 +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
f57409ddcd Merge remote-tracking branch 'origin/3.3' into develop 2013-01-15 12:06:41 +01:00
Laurent Destailleur
285bcbecb7 Fix: init of new syslog handler system 2013-01-14 17:12:13 +01:00
Laurent Destailleur
0861fbfeb6 Fix: Missing kenya currency 2013-01-13 23:47:23 +01:00
eldy
2c59c6311f Merge remote-tracking branch 'origin/3.3' into develop 2013-01-06 21:36:39 +01:00
eldy
492d00ee86 Fix: Syntax error with pgsql 2013-01-06 20:45:03 +01:00
Cedric GROSS
6a9c3dee52 Add SASU form 2013-01-05 17:07:25 +01:00
simnandez
d0265db3d2 Fix: Modify Spanish localtax2 to new rate 2013-01-05 09:07:01 +01:00
Laurent Destailleur
753d79f181 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2012-12-30 17:14:06 +01:00
Laurent Destailleur
0d09de0cf8 Fix: Normalize trigger names for fichinter module. 2012-12-30 17:13:43 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
5e05e0aa55 Fix: Trigger names 2012-12-29 17:34:52 +01:00
Laurent Destailleur
70be706347 New: Add greece regions and provinces 2012-12-09 20:01:16 +01:00
Laurent Destailleur
db91526643 Fix: Solve conflict into migration/backup/restore (child tables
must be after parent tables).
Fix: Migration of old version
2012-12-08 14:16:39 +01:00
Laurent Destailleur
bac4bf07a3 New: Add patch from pgrand to start link of several contacts onto an
event
2012-12-03 20:19:35 +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
af637c8afb Qual: Removed "dolibarr" into default email sender. 2012-11-21 14:45:02 +01:00
Laurent Destailleur
28b4a03432 Fix: Correct vat 2012-11-14 20:49:19 +01:00
Laurent Destailleur
661d37eacf Fix: New vat for switzerland 2012-11-08 12:15:15 +01:00
Laurent Destailleur
4cd1bbb0ca Fix: bad data init 2012-11-05 17:01:05 +01:00
Laurent Destailleur
8ea48b28eb New: More complete setup for bank ids according to countries 2012-10-31 00:46:46 +01:00
Regis Houssin
0441c6dd46 Merge pull request #417 from aspangaro/develop
Continue working on accountancy
2012-09-28 02:43:54 -07:00
Laurent Destailleur
6c769cfaf3 Fix: postgresql compatibility
Qual: Removed deprecated code
2012-09-27 23:54:47 +02:00
Spangaro Alexandre
e4391207e4 Add new dictionnary to edit accountingsystem 2012-09-26 20:37:28 +02:00