lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,044 Commits 43 Branches 150 Tags 886 MiB
3.6.0-alpha
Commit Graph

35302 Commits

Author SHA1 Message Date
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
Laurent Destailleur
7eea96c07c Minor fix into standing order. 2014-03-17 20:43:01 +01:00
aspangaro
ed4b69d0ab Update language key 2014-03-17 20:36:45 +01:00
Laurent Destailleur
de4ee498ea Merge pull request #1493 from aternatik/cat_extrafields 
Fix : bad character into categories lang
 2014-03-17 20:32:23 +01:00
Laurent Destailleur
20006a1347 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-17 20:29:19 +01:00
Laurent Destailleur
e491a4dce7 Add code to clean duplicate records 2014-03-17 20:29:01 +01:00
Juanjo Menent
53bb32318a Fix: Bad action set for invoice 2014-03-17 17:27:47 +01:00
Juanjo Menent
19a3088055 Fix: Add actions events not implemented 2014-03-17 17:05:55 +01:00
Laurent Destailleur
302bcc2fd5 Translation: Sync from transifex.com 2014-03-17 16:15:00 +01:00
Gauthier
eb43bc4982 Correction when adding line with price as '0' 2014-03-17 15:38:12 +01:00
Laurent Destailleur
086b319248 Fix: Translation 2014-03-17 15:16:33 +01:00
Laurent Destailleur
8cf3d258f4 Fix: Bug into calculation of total of time for tasks 2014-03-17 15:13:24 +01:00
Laurent Destailleur
2889c3ac70 Qual: Feature to make payment of salaries has been moved into a module 
(module dedicated to manage salaries and salary payments).
Qual: Also module for employee to declare trip and expenses has been
moved into same place than module for employee to declare holidays
(into HRM top entry). It is not an accountancy module so no reason to
have it into entry "Accountancy".
 2014-03-17 14:30:55 +01:00
Laurent Destailleur
e6bf2cf5aa Fix: bad char 2014-03-17 12:44:37 +01:00
Laurent Destailleur
14d8bfef3a New: Improved Opensurvey module: Description of survey use wysiwig 
editor, More information shown on result tab, Renamed "survey" into
"poll" (better translation).
 2014-03-17 12:40:12 +01:00
Laurent Destailleur
81b8961dab Qual: Dead code war 2014-03-17 11:13:53 +01:00
jfefe
2494b01cf1 Fix : bad character into categories lang 
Probably due to my table neighbor who constantly moving during devcamp ^^
 2014-03-17 10:20:43 +01:00
Laurent Destailleur
7974ae96ad Merge branch 'cat_extrafields' of https://github.com/aternatik/dolibarr 
into aternatik-cat_extrafields

Conflicts:
	htdocs/install/mysql/migration/3.5.0-3.6.0.sql
 2014-03-16 21:38:29 +01:00
Laurent Destailleur
b1498c584d Merge branch 'dluo_step5' of https://github.com/KreizIT/dolibarr into 
KreizIT-dluo_step5

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-16 20:49:56 +01:00
Laurent Destailleur
eb5e891cf9 Fix: Not mandatory field must not be not null 
Fix: field to store amount must be double(24,8)
 2014-03-16 20:37:43 +01:00
Laurent Destailleur
58add21719 Merge pull request #1488 from atm-maxime/mko1300 
Add task 1300 : Add thm field on user and time spent to be able to calculate employee cost
 2014-03-16 20:26:57 +01:00
Laurent Destailleur
b530488da1 Merge pull request #1487 from atm-maxime/mkoPHPUnit 
New PHPUnit test on project + clean initAsSpecimen
 2014-03-16 20:25:49 +01:00
Laurent Destailleur
599142566e Merge pull request #1492 from aspangaro/develop 
Fix :: Failed to apply auguria_menu
 2014-03-16 20:25:13 +01:00
aspangaro
5175dcf135 Update also eldy menu 2014-03-16 20:17:25 +01:00
Laurent Destailleur
ed4f7fd083 Fix: error 2014-03-16 20:05:07 +01:00
Laurent Destailleur
2d3c700a7d Fix: When cloning product, autogenerating barcode must not use same 
number.
Qual: Moved dedicated permission of module to "advance" permissions.
 2014-03-16 17:37:54 +01:00
aspangaro
b09d7065c9 Fix :: Failed to apply auguria_menu since integration of salary payment in tax module 2014-03-16 17:30:58 +01:00
Jean-François Ferry
5034356899 Manage extrafields deletion on categories 2014-03-16 16:06:32 +01:00
Jean-François Ferry
e2b47b9919 Category extrafields on categories: edit and view 2014-03-16 16:04:18 +01:00
Jean-François Ferry
d9baae3456 Implement extrafields into category create 2014-03-16 15:25:13 +01:00
Jean-François Ferry
f14d2fbfe0 Add information message for option into categories setup 2014-03-16 15:00:10 +01:00
Jean-François Ferry
55750e16d8 Prepare extrafields into categories 2014-03-16 14:48:46 +01:00
Maxime Kohlhaas
0083e529c7 Add task 1300 : Add thm field on user and time spent to be able to calculate employee cost 2014-03-16 14:31:02 +01:00
Maxime Kohlhaas
fe767606da New PHPUnit test on project + clean initAsSpecimen 2014-03-16 13:55:32 +01:00
Laurent Destailleur
b40835c592 Merge pull request #1486 from aternatik/fix_img_cat 
Fix: bad id when deleting picture on categorie / missing lang
 2014-03-16 13:51:39 +01:00
Jean-François Ferry
7e6777f344 Fix: bad id when deleting picture on categorie / missing lang 2014-03-16 13:49:44 +01:00
Maxime Kohlhaas
233a8fa917 Add new PHPUnit test on Entrepot 2014-03-16 11:38:39 +01:00
Maxime Kohlhaas
4d48034ad1 Fix 2014-03-16 09:50:03 +01:00
KreizIT
9be2bb0e60 Travis Fix 2014-03-16 07:00:27 +01:00
Laurent Destailleur
6eac7e1bdc Fix: CRLF 2014-03-15 23:17:46 +01:00
Laurent Destailleur
cafa61ef7d Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
Laurent Destailleur
104f2873da Qual: Remove code to fix dynamically bad code. 2014-03-15 22:30:40 +01:00
Laurent Destailleur
de59f3aafe Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-03-15 21:48:14 +01:00
Laurent Destailleur
739f80b46e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-03-15 21:46:49 +01:00
Laurent Destailleur
7e11551199 Fix: CRLF 2014-03-15 21:45:33 +01:00
Laurent Destailleur
e325921999 Merge pull request #1484 from atm-maxime/develop 
Fix : Delivery date was displayed twice
 2014-03-15 20:55:36 +01:00
Maxime Kohlhaas
685c00cd27 Fix : Delivery date was displayed twice 2014-03-15 17:55:57 +01:00
Laurent Destailleur
c41bffcb25 Merge pull request #1482 from jfefe/patch-2 
Remove debug infos into agenda index
 2014-03-15 17:29:54 +01:00
Laurent Destailleur
ad23c88f1a Merge pull request #1481 from atm-maxime/mko672 
Add : Stock can be mandatory to use a product
 2014-03-15 17:29:31 +01:00
Laurent Destailleur
f9e0660802 Merge pull request #1480 from atm-alexis/develop 
Add option to set value of credit note by invoice remaining to pay
 2014-03-15 17:23:40 +01:00
Drosis Nikos
997e16fec7 Update user.class.php 
String translated twice
 2014-03-15 17:22:34 +01:00
Laurent Destailleur
bba7778a36 Merge pull request #1479 from ndrosis/patch-1 
Update user.class.php
 2014-03-15 17:21:12 +01:00
Simnandez
4e73e4e7c7 Update es_ES from transifex 2014-03-15 16:49:18 +01:00
Florian Henry
7625629491 Fix [ bug #1294 ] Expedition model Merou having problems with long names 2014-03-15 16:40:29 +01:00
Simnandez
5216a14e37 Trad: Update es_ES from transifex 2014-03-15 16:36:25 +01:00
Florian Henry
ee70f21f58 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-03-15 16:33:24 +01:00
Florian Henry
18c4d890dd Fix [ bug #1283 ] ROUGET Shipment PDF 2014-03-15 16:32:46 +01:00
Laurent Destailleur
c9ac7fad82 Fix: Field should not be not null 2014-03-15 15:45:21 +01:00
jfefe
f648f85b61 Remove debug infos into agenda index 2014-03-15 15:44:02 +01:00
Maxime Kohlhaas
1911f6fcdc Task 672 : add stock limitation on shipment + translation 2014-03-15 14:59:27 +01:00
Alexis Algoud
839641feaf Add option to set value of credit note by invoice lake of payment 2014-03-15 14:52:08 +01:00
Drosis Nikos
8ff0022a53 Update user.class.php 
String translated twice
 2014-03-15 15:23:41 +02:00
Laurent Destailleur
7a304bff62 Merge pull request #1478 from atm-alexis/develop 
Add feature : import line from origin invoice in the new credit note
 2014-03-15 13:48:12 +01:00
Laurent Destailleur
ae8955ae94 Merge pull request #1477 from tiaris/develop 
correction 	Magazin -> Magasin
 2014-03-15 13:36:25 +01:00
Laurent Destailleur
5025d11a16 Merge pull request #1476 from tbasilici/3.5 
3.5
 2014-03-15 13:32:30 +01:00
Laurent Destailleur
6acaf20c42 Merge pull request #1474 from GPCsolutions/dolibdb 
Dolidb factorization
 2014-03-15 13:27:24 +01:00
Laurent Destailleur
271c2a8929 Merge pull request #1472 from atm-maxime/mko1074 
Task 1074 : add link to source document on stock movement
 2014-03-15 13:21:04 +01:00
Maxime Kohlhaas
b6a2fa61c8 Task 672 : only for product not services 2014-03-15 12:47:01 +01:00
Maxime Kohlhaas
9c340d7af8 Task 672 : Prevent use of product not available 2014-03-15 12:45:56 +01:00
Alexis Algoud
e3228b54e5 translate for US 2014-03-15 12:07:39 +01:00
Alexis Algoud
3a21d99edf Add feature : import line from origin invoice in the new credit note 2014-03-15 12:01:13 +01:00
jean
4aa692c2a7 correction Magazin -> Magasin 2014-03-15 11:31:20 +01:00
kaos
f55bdc64bd fixes #1300 2014-03-15 11:10:20 +01:00