Commit Graph

35274 Commits

Author SHA1 Message Date
Florian Henry
f93df7f3da remove debug string 2014-03-26 10:09:29 +01:00
Juanjo Menent
d98a5d4c6f Fix: [ bug #1306 ] Fatal error when adding an external calendar 2014-03-22 13:01:38 +01:00
Juanjo Menent
ff977f2883 Merge pull request #1501 from FHenry/develop
Add ref supplier as column and clear variables in double
2014-03-22 10:31:16 +01:00
Juanjo Menent
334455f8dd Update es_ES from transifex 2014-03-22 10:28:24 +01:00
Juanjo Menent
79ab420997 Update es_ES from transifex 2014-03-22 09:41:14 +01:00
Laurent Destailleur
29534b4ef5 Removed not used keys 2014-03-21 18:51:39 +01:00
Laurent Destailleur
ed7ffebea4 Code comment 2014-03-21 18:32:18 +01:00
Laurent Destailleur
24dbfbba60 Qual: Still working on cleaning code for timezone management. 2014-03-21 18:05:08 +01:00
Laurent Destailleur
73682baff0 Fix: Use correct vat rate into text cases.
Qual: Next step cleaning date functions.
Qual: Complete phpunit test case for dol_mktime to check dayling saving
time is correctly managed.
2014-03-21 16:22:41 +01:00
Florian Henry
cf9b194008 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-03-21 15:08:30 +01:00
Laurent Destailleur
b2f6498236 Merge remote-tracking branch 'origin/3.5' into develop 2014-03-21 15:03:37 +01:00
Laurent Destailleur
7fb004903e Qual: Start to clean old code. 2014-03-21 15:02:27 +01:00
Florian Henry
f0882eca2d Add ref supplier as column and clear varialbes in double 2014-03-21 15:01:40 +01:00
Laurent Destailleur
a884673637 Fix: A better to fix to manage automatic creation of code for import. 2014-03-21 13:29:13 +01:00
Laurent Destailleur
c1411e65b7 Fix: Try to add code to provide easy way to fix warning on timezone not
defined.
2014-03-21 10:13:29 +01:00
Laurent Destailleur
aabd923248 Try to remove warning 2014-03-21 09:49:10 +01:00
Laurent Destailleur
63bb09fbdf Fix: Removed duplicate translation 2014-03-20 00:21:52 +01:00
Laurent Destailleur
a9aaac8e15 Fix: Date was lost if error during submit. 2014-03-20 00:05:20 +01:00
Laurent Destailleur
4bf822225e Look: info admin picto now use the info picto (the star were confused
with the mandatory "star").
2014-03-19 23:50:10 +01:00
Laurent Destailleur
68396e023c New: When creating an invoice all types are visible (even if for the
moment we just show an help text to explain how to use type credit note
and deposit).
2014-03-19 23:49:07 +01:00
Laurent Destailleur
caf1eba4e2 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/compta/facture.php
2014-03-19 22:59:10 +01:00
Laurent Destailleur
4afb85bd1d Fix: Several fix into workflow/condition for invoice payments or convert
into discount.
2014-03-19 22:30:25 +01:00
Laurent Destailleur
f9c1b590d0 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/perl/virtualmin/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/core/modules/import/import_csv.modules.php
	htdocs/filefunc.inc.php
2014-03-19 22:29:18 +01:00
Laurent Destailleur
dc7db87ee5 Perf: Avoid makign a "desc table" for each row we import (for this we
are using a global cache array).
2014-03-19 20:23:29 +01:00
Laurent Destailleur
d3e951e1ec Merge remote-tracking branch 'origin/3.4' into 3.5 2014-03-19 20:22:04 +01:00
Laurent Destailleur
9cd7f68ae8 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2014-03-19 20:03:17 +01:00
Laurent Destailleur
2cced0bf43 Perf: Avoid makign a "desc table" for each row we import (for this we
are using a global cache array).
2014-03-19 20:02:39 +01:00
Laurent Destailleur
062c150bc1 Fix: import of fields with value "auto" 2014-03-19 19:33:43 +01:00
Laurent Destailleur
212deb9e1c Fix: fails to import when value is 'AUTO' because compare was case
sensitive.
2014-03-19 17:15:18 +01:00
Laurent Destailleur
2f10198064 Fix: Option MAIN_PDF_DASH_BETWEEN_LINES was not working when tcpdf was
making a pagebreak higher than 2 pages.
2014-03-19 16:36:12 +01:00
Laurent Destailleur
bf735cacbe Fix PDF: Page break was ko when breaking 2 pages or more.
Fix PDF: pdf_canelle was missing code to manage pagebreak.
Fix PDF: The width of picture was hardcoded into some templates.
Fix PDF: The atleastonediscount was not used into some templates.
2014-03-19 13:32:54 +01:00
Laurent Destailleur
5d14322679 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-03-19 11:46:44 +01:00
Laurent Destailleur
6764d36434 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-19 11:46:30 +01:00
Laurent Destailleur
44952e353d Fix: Bad format for fk_currency fields (even if they are not used, i fix
them).
2014-03-19 11:46:06 +01:00
Laurent Destailleur
dbaea6fa42 Add clean sql requests into repair.sql 2014-03-19 11:40:23 +01:00
Laurent Destailleur
20ef4554e0 Fix: missing unique key on barcode field to avoid database corruption 2014-03-18 23:43:58 +01:00
Laurent Destailleur
ce4c78972a Fix: Image always fit into window when using cropping feature even if
file is a very large file.
2014-03-18 23:24:00 +01:00
Laurent Destailleur
a05ea58181 Fix: form to add images should not show link form 2014-03-18 22:26:46 +01:00
Laurent Destailleur
ada22837a5 Fix: form to add images should not show link form 2014-03-18 22:26:09 +01:00
Laurent Destailleur
3030c2f431 Fix: form to add images should not show link form 2014-03-18 22:24:57 +01:00
Laurent Destailleur
9be52ca2c8 Fix: better way to remove duplicate barcode in repair.sql 2014-03-18 22:16:18 +01:00
Laurent Destailleur
ed05b3780e Merge pull request #1495 from aspangaro/develop
Update language key
2014-03-18 11:52:28 +01:00
aspangaro
58796b85c8 Try to correct travis 2014-03-18 06:53:45 +01:00
Laurent Destailleur
c936638eae Fix: form to add images should not show link form 2014-03-18 00:41:56 +01:00
Laurent Destailleur
80088c87ac Fix: Some debugs of module categories 2014-03-18 00:20:39 +01:00
aspangaro
a7c97cc71a Add title in list of supplier payments 2014-03-17 21:51:31 +01:00
aspangaro
4d6d7c19b2 Correct typo 2014-03-17 21:47:06 +01:00
aspangaro
59128ccefb Merge branch 'upstream/develop' 2014-03-17 21:10:15 +01:00
Laurent Destailleur
a574997191 Qual: Add unique keys constraints on barcode. 2014-03-17 20:52:06 +01:00
Laurent Destailleur
82c2ef9773 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-17 20:45:09 +01:00