Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-17 15:01:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,188 Commits 36 Branches 190 Tags
8edb51a017acca58c950f68e9dadd92a021dc29e
Commit Graph

6654 Commits

Author SHA1 Message Date
phf
127868899d Merge branch 'develop' into incoterm 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-02-23 10:42:01 +01:00
Laurent Destailleur
25bb6a588f Fix list of project must be restricted on opened status 2015-02-23 00:57:48 +01:00
Laurent Destailleur
6e10dd3cce Trad 2015-02-22 17:10:13 +01:00
Laurent Destailleur
2bc6ac4671 Finished new module to manage expense reports ! 
Fix export to support corectly multicompany
 2015-02-22 13:16:49 +01:00
Laurent Destailleur
6d1324b463 Work on expense report module 2015-02-21 16:15:54 +01:00
Laurent Destailleur
30a5111c68 Work on expense report module 2015-02-21 15:18:05 +01:00
aspangaro
63099727d0 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-02-21 15:10:35 +01:00
Laurent Destailleur
5dffe4b440 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-21 12:58:14 +01:00
Laurent Destailleur
070accd1e0 Work on new module expense report 2015-02-21 12:57:17 +01:00
Laurent Destailleur
f423386518 Sync lang 2015-02-20 20:20:12 +01:00
Laurent Destailleur
e13393da9a Merge pull request #2364 from daamien/patch-2 
FIX [ bug #1314 ] [Bank] num_releve is not incremented correctly in releve.php
 2015-02-20 18:58:10 +01:00
frederic34
2b19f75460 Files Integrity Checker 2015-02-19 21:26:03 +01:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Laurent Destailleur
ad1c2ed06f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-18 22:52:50 +01:00
Laurent Destailleur
c2f5b24a9d Better text 2015-02-18 22:40:13 +01:00
Laurent Destailleur
06c90e67bb Merge pull request #2339 from KreizIT/fix_1829 
FIXED: #1829 POS not compatible with batch products
 2015-02-18 22:38:19 +01:00
Laurent Destailleur
1c0f22b905 Merge pull request #2368 from frederic34/php-iban 
New: Add php-iban lib 1.4.6 to check iban information.
 2015-02-18 22:11:31 +01:00
Laurent Destailleur
b6947dbe2c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
 2015-02-18 22:04:26 +01:00
Laurent Destailleur
cc1d506614 Miscelaneous debug on barcode features. 2015-02-18 21:01:17 +01:00
frederic34
4bbbff8d69 Add BIC/SWIFT Validation 2015-02-17 22:04:16 +01:00
frederic34
f652cf4e97 Add translation for IBAN Valid or not 2015-02-17 17:02:38 +01:00
Laurent Destailleur
685b8d722d Fix: Bad hook name 2015-02-17 16:46:37 +01:00
Laurent Destailleur
23562a01ab Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_US/stocks.lang
 2015-02-16 20:59:04 +01:00
Laurent Destailleur
1e78d0e8d4 New: Introduce hidden option 
STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS to solve, with no risk, a
missing control on missing warehouse.
 2015-02-16 20:46:54 +01:00
Laurent Destailleur
9a9a1f3983 Fix bad id 2015-02-16 19:14:34 +01:00
Gauthier
02d59cce5a NEW : Product stock and subproduct stock are independant 2015-02-16 16:06:50 +01:00
damien clochard
53dc28ddc3 There's only 2 sortable formats 2015-02-16 11:01:08 +01:00
Laurent Destailleur
9ab48b3d90 Revert "Trad" 
This reverts commit bb2c33e2c1.
 2015-02-15 22:51:18 +01:00
Laurent Destailleur
bb2c33e2c1 Trad 2015-02-15 22:49:53 +01:00
Laurent Destailleur
2e0b2fb012 Work on expensereport module 2015-02-15 22:49:23 +01:00
Laurent Destailleur
e5b401c8f2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/langs/es_ES/agenda.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/langs/fr_FR/suppliers.lang
 2015-02-15 19:51:49 +01:00
Laurent Destailleur
3b09dc53cd Fix regression on total visible on invoice since situation invoice. 2015-02-14 20:32:11 +01:00
Laurent Destailleur
448655ea45 First work on a new module for expense report matching dolibarr 
standard to replace current one.
 2015-02-14 18:39:45 +01:00
Laurent Destailleur
c596fa1475 Introduce a protection to avoid migration if database has critical bugs 
making data lost.
 2015-02-14 12:24:16 +01:00
Laurent Destailleur
46b1e213b9 Sync from transifex 2015-02-13 21:26:43 +01:00
Laurent Destailleur
e4e49e8a0b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/product/stock/product.php
 2015-02-12 15:41:48 +01:00
Laurent Destailleur
206a453ce2 Solve confusion into number of order or qty into order. 2015-02-12 15:40:06 +01:00
Laurent Destailleur
c727e2b8ec Fix bad translation 
Conflicts:
	htdocs/product/stock/product.php
 2015-02-12 15:29:21 +01:00
Laurent Destailleur
6adfc6f6f4 Work on batch module. Add batch, eatby and sellby into movement table. 
Clean language files for direct print module.
 2015-02-12 15:23:31 +01:00
Laurent Destailleur
b49c8f84b6 Fix bad translation 2015-02-12 15:22:04 +01:00
Laurent Destailleur
689354f927 New: A default label is suggested for stock correction and transfer 
instead of empty string.
 2015-02-11 23:54:42 +01:00
Laurent Destailleur
179cbbd187 Maxi debug and enhancement of module batch. 2015-02-11 22:54:06 +01:00
Laurent Destailleur
b9d2de99e1 Translation 2015-02-11 14:46:16 +01:00
Laurent Destailleur
8a6d3aa633 Clean module print system 2015-02-11 14:22:44 +01:00
Laurent Destailleur
d5ec19ef83 Enhance help when running cron script from command line 2015-02-11 13:21:12 +01:00
Laurent Destailleur
e3885d6d73 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/lib/tax.lib.php
 2015-02-10 21:36:38 +01:00
Laurent Destailleur
ddb95e5765 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/mailing/fiche.php
	htdocs/compta/paiement/liste.php
	htdocs/contact/class/contact.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/langs/en_US/agenda.lang
	htdocs/webservices/server_contact.php
 2015-02-10 21:33:43 +01:00
Laurent Destailleur
abcf4480de Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-10 21:02:23 +01:00
Laurent Destailleur
fce7a0e36e Bad translation 2015-02-10 21:01:44 +01:00
phf
792ec17993 [CORE] ajout de traductions ( #incoterm). 2015-02-09 17:56:06 +01:00