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

6072 Commits

Author SHA1 Message Date
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
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
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
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
Jean-François Ferry
7e6777f344 Fix: bad id when deleting picture on categorie / missing lang 2014-03-16 13:49:44 +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
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
Alexis Algoud
e3228b54e5 translate for US 2014-03-15 12:07:39 +01:00
Laurent Destailleur
4154f07dfd New: Add a public url as a property for products/services. 2014-03-14 13:51:46 +01:00
Laurent Destailleur
da5610bf3f Merge branch 'es_CL-language' of https://github.com/marcosgdf/dolibarr 
into marcosgdf-es_CL-language

Conflicts:
	ChangeLog
 2014-03-13 23:40:43 +01:00
Laurent Destailleur
f1b05dd3c2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-03-13 12:37:39 +01:00
Laurent Destailleur
6cec011df6 New: Add manager name (ceo, director, president...) into main company 
information page.
 2014-03-13 12:22:53 +01:00
Laurent Destailleur
743b0f1834 Merge pull request #1458 from KreizIT/dluo_step4 
Dluo step4
 2014-03-13 11:57:06 +01:00
Laurent Destailleur
1b85f83dbb Merge pull request #1466 from marcosgdf/minor 
Minor style and translation corrections
 2014-03-13 11:53:52 +01:00
Laurent Destailleur
813f55e50b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-03-13 11:38:48 +01:00
Laurent Destailleur
bdb2b7a547 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/projet/index.php
	test/phpunit/FunctionsTest.php
 2014-03-13 09:20:05 +01:00
Laurent Destailleur
4acf721c8c Merge pull request #1451 from KreizIT/dluo_step3 
Batch number management Step 3
 2014-03-11 15:54:23 +01:00
Laurent Destailleur
0c321a2a9b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-03-11 15:50:32 +01:00
Laurent Destailleur
9a40894423 Fix: translation 2014-03-11 13:14:40 +01:00
Laurent Destailleur
86ad05c22e Merge pull request #1461 from marcosgdf/unknown-error 
Corrected Unknown error message typo
 2014-03-11 11:54:08 +01:00
Marcos García de La Fuente
96143ff4a7 Added missing translation keys 2014-03-11 11:41:19 +01:00
aspangaro
d97f9e50cd Merge branch 'upstream/develop' 2014-03-11 10:40:22 +01:00
aspangaro
12ffb19cec Use more explicit name for class and functions 2014-03-11 06:26:18 +01:00
Marcos García de La Fuente
89a4c51153 Added es_CL language 2014-03-10 21:13:16 +01:00
Marcos García de La Fuente
fa56fe4e8b Corrected Unknown error message typo 2014-03-10 19:36:32 +01:00
Laurent Destailleur
4fe4d0fcbc Fix: Translation source 2014-03-09 03:14:53 +01:00
KreizIT
a0f1a60780 Change on shipment for batch product 2014-03-07 11:35:16 +01:00
aspangaro
74d3fdae15 Update langs & fix period for salaries in tax module 2014-03-07 06:42:48 +01:00
aspangaro
fca29f4312 Add table into script migration && key language 2014-03-06 21:29:20 +01:00
aspangaro
048b3c01ce Add salary payment in tax module - Link to user. 
Necessary for future hrm module.
 2014-03-06 21:21:16 +01:00
Laurent Destailleur
b762c66c8a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-03-06 18:04:19 +01:00
Laurent Destailleur
c4c82f84c5 Fix: Typo 2014-03-06 16:41:56 +01:00
Laurent Destailleur
8f31af9825 Fix: Translation 2014-03-05 16:42:10 +01:00
Laurent Destailleur
6c536d43e5 Can also sort on username. Uniformize code of index page. 2014-03-05 11:37:32 +01:00
KreizIT
58f2bf078b -Add batch record management 
-Implements stock increase or decrease with batch number record on product's warehouse tab
 2014-03-05 10:54:07 +01:00
Laurent Destailleur
cdd2815d45 Merge pull request #1449 from KreizIT/dluo_step2 
Dluo step2
 2014-03-05 00:08:58 +01:00
KreizIT
7f275dfbf4 - Add table modification for product (forget in step 1) 
- Add module for batch number management
- change dependency for stock and product
- change product class and fiche showing new select for batch managment on product
 2014-03-04 18:55:55 +01:00
Laurent Destailleur
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-03 19:38:02 +01:00
Laurent Destailleur
a084887442 Merge branch 'project-translations' of 
https://github.com/marcosgdf/dolibarr into
marcosgdf-project-translations

Conflicts:
	ChangeLog
 2014-03-01 13:38:50 +01:00
Laurent Destailleur
66a3a28eb2 Fix: Update translation guide 2014-02-28 22:51:04 +01:00
Laurent Destailleur
480b09f192 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/societe/class/societe.class.php
 2014-02-26 15:49:29 +01:00
Laurent Destailleur
e8cadf3a3e New: Add form search customer order on commercial main page. 2014-02-25 18:33:04 +01:00
Laurent Destailleur
3f05651b94 Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5 2014-02-25 16:14:51 +01:00
Laurent Destailleur
736778d56a New: Add message to explain how to use the page. Make things more clear 
for user.
 2014-02-25 16:13:23 +01:00
Laurent Destailleur
63a2aa3365 Fix: sql error with postgres when creating extrafield with an upper cas 
character. code for new fields must be always lowercase.
 2014-02-25 15:48:13 +01:00
Laurent Destailleur
7241714551 Merge pull request #1435 from marcosgdf/export-translations 
Corrected export translations
 2014-02-25 14:11:40 +01:00