Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

6584 Commits

Author SHA1 Message Date
Laurent Destailleur
6f60755426 New: Add option MAIN_FAVICON_URL 2014-03-05 17:26:59 +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
philippe
e2b29bb108 fix english misspelling 2014-03-05 09:57:36 +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
Marcos García de La Fuente
4411908b23 Fixed translations of project export wizard 2014-02-25 04:18:13 +01:00
Marcos García de La Fuente
4157452c6d Translated export filters 2014-02-25 03:23:08 +01:00
Marcos García de La Fuente
7ac405e067 Added SpecialCode translation key 2014-02-25 03:20:37 +01:00
Marcos García de La Fuente
968b5771db Corrected project contact types translation 2014-02-25 02:42:10 +01:00
Laurent Destailleur
f537f62aea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/facture/impayees.php
 2014-02-24 17:09:21 +01:00
Laurent Destailleur
22854e5743 New: Sending remind of unpayed invoices by emails (need tester) 2014-02-24 16:50:36 +01:00
Laurent Destailleur
28739414f2 Merge pull request #1430 from FHenry/develop 
Price management enhancement (multiprice level, price by …  customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
 2014-02-24 10:14:48 +01:00
Laurent Destailleur
0a3737ea02 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-02-23 22:24:32 +01:00
Laurent Destailleur
68058d0e4f Add a confirm box before deleting. 2014-02-23 22:24:13 +01:00
Florian Henry
46ae5d6e9c - New: Price management enhancement (multiprice level, price by 
customer, if MAIN_FEATURES_LEVEL=2 Price by qty)
- Fix: Project Task numbering rule customs rule works
 2014-02-23 16:16:47 +01:00
simnandez
36bc225208 Trad: es_ES Sync from transifex 2014-02-21 12:49:24 +01:00
Laurent Destailleur
1685729393 New: Can reset barcode also for barcode already defined. 2014-02-20 23:09:24 +01:00
Laurent Destailleur
07ee85b097 New: Can reset barcode also for barcode already defined. 2014-02-20 22:08:32 +01:00
Laurent Destailleur
6c103f4c6b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-02-20 09:52:01 +01:00
Laurent Destailleur
9da84e4dd8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-02-20 00:37:20 +01:00
Laurent Destailleur
6f962397e4 Start to work on a mass send remind feature. 2014-02-19 20:23:02 +01:00
simnandez
c2db656c86 Fix: Action event SHIPPING_VALIDATE is not implemented 2014-02-19 17:33:22 +01:00
simnandez
7511f626b3 Fix: Action event SHIPPING_VALIDATE is not implemented 2014-02-19 17:32:20 +01:00
Laurent Destailleur
0b7f623c31 New: Add an admin page to make a mass init of barcode values for all 
products.
 2014-02-19 17:04:21 +01:00
Laurent Destailleur
5a29b3d546 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/societe/soc.php
 2014-02-19 15:37:48 +01:00
Laurent Destailleur
4915ec8916 Fix: Bad space in predefined messages. 
Fix: Signature was not added for email sent from thirdparty page.
 2014-02-19 15:33:04 +01:00
Laurent Destailleur
96e7985266 Fix: Translation of menu entries must not be into admin lang file (We 
don't want to load this file for common pages).
 2014-02-19 02:27:13 +01:00
Laurent Destailleur
2e67bbc382 Maxi debug of barcode feature. 
New: Barcode format and mandatory requirement is checked.
New: Start to add new page for barcode init.
 2014-02-19 01:51:19 +01:00
Laurent Destailleur
03d056319c Qual: Clean code for adding menu entries into Modules system admin 
entry.
New: Add entry for admin page Mass barcode init.
 2014-02-18 20:49:22 +01:00
Laurent Destailleur
396ac5fb2b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2014-02-18 18:55:50 +01:00
Laurent Destailleur
c8d6a88f8a Clean xdebug page. 2014-02-17 16:30:22 +01:00
Laurent Destailleur
860ca15cfc Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2014-02-17 15:27:30 +01:00
Laurent Destailleur
fa7e7c75bf Fix: Add a protection if user has no option to edit stock 2014-02-17 11:48:57 +01:00
Laurent Destailleur
f987a43358 Fix: Translation 2014-02-17 11:19:50 +01:00
Laurent Destailleur
908c39098d Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-16 19:47:51 +01:00
Laurent Destailleur
7e3c2d40ba New: Make difference between virtual and physical stock easier to 
understand.
 2014-02-15 14:14:49 +01:00
Laurent Destailleur
ff16d7446b Update translation 2014-02-14 17:54:45 +01:00
Laurent Destailleur
2e7631fa78 Fix: translation 2014-02-12 15:17:33 +01:00
Laurent Destailleur
492dec0854 Sync from transifex 2014-02-11 23:19:22 +01:00