Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-14 13:31:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
49,784 Commits 36 Branches 190 Tags
039039bb0078007af2495f1655956afb51a4ac05
Commit Graph

6014 Commits

Author SHA1 Message Date
Laurent Destailleur
89c9996b22 Fix translation of status 2015-05-04 09:50:49 +02:00
jfefe
53f480708f Merge branch 'develop' into api_restler 2015-05-03 23:43:13 +02:00
Laurent Destailleur
8a7728f193 Merge pull request #2752 from fappels/develop-tcpdfbarcode 
NEW add tcpdf barcode generator and printing, add 2d Datamatrix and QRcode CLOSE #2655
 2015-05-03 21:19:01 +02:00
Laurent Destailleur
333a29683c uniformize look 2015-05-03 21:15:08 +02:00
Laurent Destailleur
f0b10c14d7 NEW Add a new component to select categories/tags from the main edit 
page of product. The dedicated tab is also removed.
 2015-05-03 15:51:55 +02:00
Laurent Destailleur
984aca28c3 Sync translation 2015-05-03 15:37:15 +02:00
Francis Appels
f9908c48cb Add datamatrix en qrcode barcodes 2015-05-03 10:07:04 +02:00
jfefe
4ccb04590e Add API admin page 2015-05-02 15:27:19 +02:00
aspangaro
1174c67b07 Accountancy - Add key language & prepare journal for expense report 2015-05-02 06:42:06 +02:00
Laurent Destailleur
53bf90a3e2 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2015-04-28 21:54:13 +02:00
Laurent Destailleur
ce05837237 Translation 2015-04-27 09:55:59 +02:00
Laurent Destailleur
aa9bffe5c9 Fix translation 2015-04-27 02:34:15 +02:00
Laurent Destailleur
414404e854 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/core/class/commonobject.class.php
 2015-04-26 16:30:33 +02:00
Laurent Destailleur
7b9d9c4d0a Fix lang 2015-04-26 16:25:02 +02:00
Laurent Destailleur
60a56da370 Some change into css. Tabs background are now white so main content is 
black on white (better contrast).
Fix editfieldval for date.
 2015-04-25 22:20:10 +02:00
Laurent Destailleur
94ff635cc2 NEW Add filter on user contact or user task into task list 2015-04-23 16:20:25 +02:00
Laurent Destailleur
100fa1067e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
 2015-04-22 17:57:57 +02:00
Laurent Destailleur
3d609d5fd0 Sync transifex 2015-04-22 14:58:06 +02:00
Laurent Destailleur
9d1c609c4f Merge pull request #2538 from marcosgdf/units 
NEW [ task 977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
 2015-04-21 11:14:50 +02:00
Laurent Destailleur
94589b9935 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-19 23:15:39 +02:00
Laurent Destailleur
65dafeee55 Uniformize feature between invoice and merging tool 2015-04-19 23:15:24 +02:00
Marcos García de La Fuente
87f97ed545 Merge branch 'develop' into units 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/admin/product.php
	htdocs/product/card.php
 2015-04-18 23:38:14 +02:00
Laurent Destailleur
9dd73de9b0 Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into marcosgdf-fr-2613 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-04-18 20:47:20 +02:00
Marcos García de La Fuente
dc790ff586 NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
Laurent Destailleur
8be83cd043 Merge branch 'develop' of https://github.com/fappels/dolibarr into fappels-develop 
Conflicts:
	htdocs/langs/en_US/sendings.lang
 2015-04-18 20:29:25 +02:00
Laurent Destailleur
b3fc8d2940 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 
Conflicts:
	htdocs/langs/en_US/products.lang
 2015-04-18 20:27:50 +02:00
Laurent Destailleur
fcbb4a5328 Merge branch 'langtool' of https://github.com/Diciannove/dolibarr into Diciannove-langtool 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/en_US/orders.lang
	htdocs/langs/en_US/stocks.lang
 2015-04-18 20:26:23 +02:00
Francis Appels
308ee40134 Fix Lang part2 
Fix lang in en_us
 2015-04-18 18:53:25 +02:00
Florian HENRY
e15d4c045d NEW : Propal merge product card PDF into azur 2015-04-18 18:44:05 +02:00
faust
4bb83de146 en_US: fix lang 2015-04-18 18:03:40 +02:00
faust
b7fb3d7d9e en_US: 'opened' is not an adjective... 2015-04-18 16:39:57 +02:00
faust
fb57cced55 en_US: fix typos and errors 2015-04-18 16:04:48 +02:00
faust
9a3b5305fe fix duplicate lines 2015-04-18 15:35:19 +02:00
Laurent Destailleur
a5ba7c664e Merge pull request #2627 from FHenry/develop 
NEW : Email template choose on thirdparty card
 2015-04-18 15:24:46 +02:00
Francis Appels
d6fc0aa7b5 FIX lang 2015-04-18 11:42:38 +02:00
Florian HENRY
6391fd0c40 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-18 11:07:07 +02:00
Florian HENRY
3d8a7ee179 Start email template selector 2015-04-18 11:06:53 +02:00
Laurent Destailleur
f17a6cbe7e Merge branch 'develop' of https://github.com/novalore/dolibarr into 
novalore-develop

Conflicts:
	htdocs/langs/en_US/trips.lang
 2015-04-18 03:37:18 +02:00
faust
c21961c4d8 word order in workflow.lang 2015-04-18 00:50:32 +02:00
faust
066e05a8ef another typo 2015-04-18 00:21:25 +02:00
Laurent Destailleur
5617399974 Removed deprecatd lines 2015-04-18 00:13:12 +02:00
faust
a54dd15afb fixed typos in trips.lang 2015-04-18 00:04:09 +02:00
Laurent Destailleur
9a604fa0bc Fix grammar 2015-04-15 17:55:59 +02:00
Laurent Destailleur
c668b82fd5 Fix translation 2015-04-14 14:23:26 +02:00
Laurent Destailleur
97cdc55839 NEW Module notification should details of emails into confirm box, not 
only number.
 2015-04-13 17:04:18 +02:00
Laurent Destailleur
ae103e34b8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/compta/facture.php
	htdocs/core/lib/price.lib.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/opensurvey/public/studs.php
	htdocs/projet/element.php
 2015-04-13 13:08:46 +02:00
Laurent Destailleur
0e7f4db0bb Move translation key 2015-04-13 09:59:38 +02:00
Laurent Destailleur
8ebad7a395 A serious rewrite of a lot of code to have the module batch number 
stable.
 2015-04-12 17:08:14 +02:00
Laurent Destailleur
1272b03e5e Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/product/stock/mouvement.php
	htdocs/projet/element.php
	htdocs/societe/rib.php
	htdocs/theme/bureau2crea/img/statut4.png
 2015-04-12 12:03:59 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO 
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
 2015-04-12 04:01:28 +02:00