Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

52 Commits

Author SHA1 Message Date
Laurent Destailleur
2a18bce2f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/api/index.php
	htdocs/langs/en_US/productbatch.lang
	htdocs/langs/fr_FR/productbatch.lang
	htdocs/ticket/list.php
 2022-02-16 20:31:55 +01:00
Noé Cendrier
98c50f531c translation string instead of error message text 2022-02-16 15:57:39 +01:00
Laurent Destailleur
31ca78acda Sync transifex. 
Fix install.
 2022-02-07 14:25:20 +01:00
Laurent Destailleur
48c990a8bf Sync transifex 2022-01-02 18:22:18 +01:00
lmarcouiller
0d65fdad23 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#2 2021-11-29 10:38:11 +01:00
Laurent Destailleur
ec78f21c26 Sync transifex 2021-11-13 15:17:06 +01:00
Lucas Marcouiller
1f64b09430 WIP : fix inventory scan 2021-10-21 18:07:54 +02:00
Laurent Destailleur
514bcc87ea Sync transifex 2021-10-17 15:53:29 +02:00
Laurent Destailleur
4b2bbd0364 Sync transifex 2021-07-11 20:27:03 +02:00
Laurent Destailleur
6ef08852f3 Transifex sync 2021-06-26 22:51:23 +02:00
Noé Cendrier
b608038370
Merge branch 'develop' into productcard_traceability_fields 2021-05-06 17:41:11 +02:00
Laurent Destailleur
6019df2dfc Merge branch 'batch_status_dict' of 
https://github.com/altairisfr/dolibarr into altairisfr-batch_status_dict

# Conflicts:
#	htdocs/langs/fr_FR/productbatch.lang
 2021-05-06 17:29:41 +02:00
Noé Cendrier
5e57a7173d
Merge branch 'develop' into productcard_traceability_fields 2021-05-06 15:21:48 +02:00
altairis-noe
c1b5d26ca0 reconcile before PR - second take 2021-05-06 15:20:49 +02:00
altairis-noe
b979fad859 reconcile before PR 2021-05-06 15:19:29 +02:00
altairis-noe
2bdea3732d days in lifetime trans 2021-05-06 14:52:48 +02:00
altairis-noe
94e485aa06 qc_frequency in days and qcstatus elsewhere 2021-05-05 16:56:25 +02:00
Laurent Destailleur
7860464724 Sync transifex 2021-05-05 01:48:21 +02:00
altairis-noe
38bba5dddc Merge branch 'develop' into batch_status_dict 2021-04-29 13:13:41 +02:00
altairis-noe
b04afc1753 merge conflict resolution 2021-04-29 13:08:24 +02:00
altairis-noe
762f41ea86 llx_c_productbatch_qcstatus as dictionnary name 2021-04-29 12:49:15 +02:00
altairis-noe
1a52ff6990 language strings 2021-04-27 17:38:32 +02:00
altairis-noe
d340e21cb3 No translation for dictionary labels 2021-04-20 16:13:36 +02:00
altairis-noe
07cd751c59 batch status dictionnary 2021-04-20 15:51:02 +02:00
Christophe Battarel
ccc05a0a43
Merge branch 'develop' into batch_mask_product 2021-04-14 08:30:19 +02:00
altairis-noe
000342c2d8 custom masks : create, edit and display 2021-04-09 13:40:37 +02:00
altairis-noe
fc76e06058 Better tooltip, better name, translation 2021-04-07 10:25:30 +02:00
Christophe Battarel
ba51c5dc70 differentiate masks for lot management and serial numbers management 2021-03-11 10:44:55 +01:00
Christophe Battarel
acea36acf2 better check for unicity 2021-03-05 08:39:30 +01:00
Christophe Battarel
6a242edd8b check unicity of serial number 2021-03-04 15:29:47 +01:00
Christophe Battarel
4aaf9e133a change translation 2021-02-26 11:51:23 +01:00
Christophe Battarel
a61fa2b049 differentiate serial numbers from lot management 2021-02-25 15:15:00 +01:00
Laurent Destailleur
74890ce656 Sync transifex 2018-06-06 12:02:33 +02:00
Laurent Destailleur
6a96a9765f Transifex sync 2017-12-21 15:04:04 +01:00
Laurent Destailleur
5d7214c4e8 Sync transifex 2017-12-02 15:20:59 +01:00
Laurent Destailleur
9dcec5d6cf Sync transifex 2017-11-28 12:32:23 +01:00
Laurent Destailleur
e7a09c07f9 Sync and clean language files 2016-10-11 10:38:38 +02:00
Laurent Destailleur
b162eb1bb0 Update translation for 3.9 2016-01-29 00:40:15 +01:00
Juanjo Menent
ba97763ac4 Transifex Syncro 2015-06-26 17:40:47 +02:00
Laurent Destailleur
3cfe4dc86e Sync language files 2015-05-31 03:07:17 +02:00
Laurent Destailleur
3d609d5fd0 Sync transifex 2015-04-22 14:58:06 +02:00
Laurent Destailleur
0f51314c7e Sync from transifex 2015-04-02 13:28:20 +02:00
Laurent Destailleur
a8e7d90ea3 Sync transifex 2015-03-13 22:02:53 +01:00
Laurent Destailleur
46b1e213b9 Sync from transifex 2015-02-13 21:26:43 +01:00
Laurent Destailleur
d2398dd1b1 Sync from transifex 2014-12-15 10:31:40 +01:00
Laurent Destailleur
a9338a0f9f Fix: Maxi debug of module productbatch. 
Conflicts:
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang
 2014-12-05 16:04:37 +01:00
Cedric
769c9a9b66 FIX stock inconsistency when activating batch management on product which already have stock 2014-07-15 11:22:16 +02: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
KreizIT
3782742aad - add batch management on supplier dispatch product 
- SECURITY FIX : replace $_GET and $_POST by GETPOST in dispatch.php
 2014-03-15 10:28:01 +01:00
KreizIT
a0f1a60780 Change on shipment for batch product 2014-03-07 11:35:16 +01:00